- Update vilya to snapshot narya and make necessary changes for it to build

core/src/main/java/com/threerings/whirled/spot/data/ClusterObject.java

@@ -26,6 +26,7 @@ import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.OidList;
 
 import com.threerings.crowd.chat.data.SpeakObject;
+import com.threerings.crowd.chat.data.UserMessage;
 
 /**
  * Used to dispatch chat in clusters.
@@ -48,10 +49,16 @@ public class ClusterObject extends DObject
     public void applyToListeners (ListenerOp op)
     {
         for (int ii = 0, ll = occupants.size(); ii < ll; ii++) {
-            op.apply(occupants.get(ii));
+            op.apply(this, occupants.get(ii));
         }
     }
 
+    // from SpeakObject
+    public String getChatIdentifier (UserMessage msg)
+    {
+        return SpeakObject.DEFAULT_IDENTIFIER;
+    }
+
     // AUTO-GENERATED: METHODS START
     /**
      * Requests that <code>oid</code> be added to the <code>occupants</code>