Changeset 9606 in orxonox.OLD

Timestamp:

Jul 29, 2006, 12:00:50 PM (18 years ago)

Author:

patrick

Message:

permissions war i think…

File:

• branches/proxy/src/lib/network/synchronizeable.cc (modified) (2 diffs)

branches/proxy/src/lib/network/synchronizeable.cc

@@ -213 +213 @@
     if( SharedNetworkData::getInstance()->isMasterServer() && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
       hasPermission = true;
-    else if( SharedNetworkData::getInstance()->isMasterServer() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ))
+    else if( SharedNetworkData::getInstance()->isMasterServer()  && this->networkStream->isUserLocal(userId) &&
+             this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ))
       hasPermission = true;
 
@@ -219 +220 @@
     else if( SharedNetworkData::getInstance()->isProxyServerActive() && (*it)->checkPermission( PERMISSION_PROXY_SERVER ))
       hasPermission = true;
-    else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ))
+    else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserLocal(userId) &&
+             this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ))
       hasPermission = true;
     // PROXY_SERVER  |====> MASTER_SERVER