diff --git a/src/main/as/com/threerings/presents/data/ClientObject.as b/src/main/as/com/threerings/presents/data/ClientObject.as index 18843f203..f2fd2bbb2 100644 --- a/src/main/as/com/threerings/presents/data/ClientObject.as +++ b/src/main/as/com/threerings/presents/data/ClientObject.as @@ -122,8 +122,6 @@ public class ClientObject extends DObject super.readObject(ins); username = Name(ins.readObject()); receivers = DSet(ins.readObject()); - // TEMP: read and throw away ClientObject._ignore from the Java side - ins.readObject(); } protected function createPermissionPolicy () :PermissionPolicy diff --git a/src/main/java/com/threerings/presents/data/ClientObject.java b/src/main/java/com/threerings/presents/data/ClientObject.java index c71285a0b..655c780b5 100644 --- a/src/main/java/com/threerings/presents/data/ClientObject.java +++ b/src/main/java/com/threerings/presents/data/ClientObject.java @@ -229,8 +229,4 @@ public class ClientObject extends DObject /** Used to reference count resolved client objects. */ protected transient int _references; - - /** TEMP: a non-transient backwards compatible permission policy for extant C++ clients. */ - protected com.threerings.presents.data.PermissionPolicy _ignore = - new com.threerings.presents.data.PermissionPolicy(); } diff --git a/src/main/java/com/threerings/presents/data/PermissionPolicy.java b/src/main/java/com/threerings/presents/data/PermissionPolicy.java deleted file mode 100644 index 83685522c..000000000 --- a/src/main/java/com/threerings/presents/data/PermissionPolicy.java +++ /dev/null @@ -1,31 +0,0 @@ -// -// $Id$ -// -// Narya library - tools for developing networked games -// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved -// http://code.google.com/p/narya/ -// -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Lesser General Public License as published -// by the Free Software Foundation; either version 2.1 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -package com.threerings.presents.data; - -import com.threerings.io.Streamable; - -/** - * TEMP: dummy PermissionPolicy file for backwards compatibility with C++. Going away soon. - */ -public class PermissionPolicy implements Streamable -{ -}