Changeset 9453 in orxonox.OLD for branches/proxy/src/lib/network/synchronizeable.cc

Timestamp:

Jul 25, 2006, 11:12:44 AM (19 years ago)

Author:

patrick

Message:

another framework switch

File:

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

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

@@ -354 +354 @@
       hasPermission = true;
     // now check PROXY_SERVER permissions
-    else if( this->networkStream->isUserProxyServer( userId )  && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
+    else if( this->networkStream->isUserProxyServerActive( userId )  && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
       hasPermission = true;
     // now check OWNER permissions
@@ -366 +366 @@
       hasPermission = true;
     // SPECIAL: get write permissions if im sending to a proxy server that does not own this sync
-    else if( this->networkStream->isUserProxyServer( userId )  && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))
+    else if( this->networkStream->isUserProxyServerActive( userId )  && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))
       hasPermission = true;
     else