rollback r4636 due to interference with non-yohoho projects

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4637 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/presents/client/Client.java

@@ -37,7 +37,6 @@ import com.threerings.presents.net.BootstrapData;
 import com.threerings.presents.net.Credentials;
 import com.threerings.presents.net.PingRequest;
 import com.threerings.presents.net.PongResponse;
-import com.threerings.presents.server.LocalDObjectMgr;
 
 /**
  * Through the client object, a connection to the system is established and maintained. The client
@@ -620,7 +619,6 @@ public class Client
                 // clear out our references
                 _comm = null;
                 _omgr = null;
-                LocalDObjectMgr.clomgr = null;
                 _clobj = null;
                 _cloid = -1;
                 _standalone = false;

src/java/com/threerings/presents/server/LocalDObjectMgr.java

@@ -45,7 +45,7 @@ public class LocalDObjectMgr extends PresentsDObjectMgr
      */
     public DObjectManager getClientDObjectMgr (final int clientOid)
     {
-        clomgr = new DObjectManager() {
+        return new DObjectManager() {
             public boolean isManager (DObject object) {
                 return LocalDObjectMgr.this.isManager(object);
             }
@@ -65,7 +65,6 @@ public class LocalDObjectMgr extends PresentsDObjectMgr
                 LocalDObjectMgr.this.removedLastSubscriber(obj, deathWish);
             }
         };
-        return clomgr;
     }
 
     // documentation inherited
@@ -93,6 +92,4 @@ public class LocalDObjectMgr extends PresentsDObjectMgr
         // accounting data
         EventQueue.invokeLater(unit);
     }
-
-    public static DObjectManager clomgr = null;
 }