From ec6cf00d6fac4355d7ef4443f50fbe9760eaaba6 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Wed, 25 Jun 2003 17:17:41 +0000
Subject: [PATCH] Ask the place object if it needs to be broadcasted on before
 doing so.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2683 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/crowd/chat/server/ChatProvider.java    |  8 +++++---
 src/java/com/threerings/crowd/data/PlaceObject.dobj   | 11 ++++++++++-
 src/java/com/threerings/crowd/data/PlaceObject.java   | 11 ++++++++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/java/com/threerings/crowd/chat/server/ChatProvider.java b/src/java/com/threerings/crowd/chat/server/ChatProvider.java
index 760d0ce09..a87bd4b5b 100644
--- a/src/java/com/threerings/crowd/chat/server/ChatProvider.java
+++ b/src/java/com/threerings/crowd/chat/server/ChatProvider.java
@@ -1,5 +1,5 @@
 //
-// $Id: ChatProvider.java,v 1.20 2003/06/14 00:55:19 mdb Exp $
+// $Id: ChatProvider.java,v 1.21 2003/06/25 17:17:41 ray Exp $
 
 package com.threerings.crowd.chat.server;
 
@@ -103,8 +103,10 @@ public class ChatProvider
         Iterator iter = CrowdServer.plreg.enumeratePlaces();
         while (iter.hasNext()) {
             PlaceObject plobj = (PlaceObject)iter.next();
-            SpeakProvider.sendSpeak(plobj, body.username, null,
-                                    message, BROADCAST_MODE);
+            if (plobj.shouldBroadcast()) {
+                SpeakProvider.sendSpeak(plobj, body.username, null,
+                                        message, BROADCAST_MODE);
+            }
         }
     }
 
diff --git a/src/java/com/threerings/crowd/data/PlaceObject.dobj b/src/java/com/threerings/crowd/data/PlaceObject.dobj
index 10a854135..1c7edc937 100644
--- a/src/java/com/threerings/crowd/data/PlaceObject.dobj
+++ b/src/java/com/threerings/crowd/data/PlaceObject.dobj
@@ -1,5 +1,5 @@
 //
-// $Id: PlaceObject.dobj,v 1.14 2003/06/14 00:55:40 mdb Exp $
+// $Id: PlaceObject.dobj,v 1.15 2003/06/25 17:17:41 ray Exp $
 
 package com.threerings.crowd.data;
 
@@ -37,6 +37,15 @@ public class PlaceObject extends DObject
     /** Used to generate speak requests on this place object. */
     public SpeakMarshaller speakService;
 
+    /**
+     * Used to indicate whether broadcast chat messages should be dispatched
+     * on this place object.
+     */
+    public boolean shouldBroadcast ()
+    {
+        return true;
+    }
+
     /**
      * Looks up a user's occupant info by name.
      *
diff --git a/src/java/com/threerings/crowd/data/PlaceObject.java b/src/java/com/threerings/crowd/data/PlaceObject.java
index 769ee7a98..2c3074e58 100644
--- a/src/java/com/threerings/crowd/data/PlaceObject.java
+++ b/src/java/com/threerings/crowd/data/PlaceObject.java
@@ -1,5 +1,5 @@
 //
-// $Id: PlaceObject.java,v 1.13 2003/06/14 00:55:40 mdb Exp $
+// $Id: PlaceObject.java,v 1.14 2003/06/25 17:17:41 ray Exp $
 
 package com.threerings.crowd.data;
 
@@ -46,6 +46,15 @@ public class PlaceObject extends DObject
     /** Used to generate speak requests on this place object. */
     public SpeakMarshaller speakService;
 
+    /**
+     * Used to indicate whether broadcast chat messages should be dispatched
+     * on this place object.
+     */
+    public boolean shouldBroadcast ()
+    {
+        return true;
+    }
+
     /**
      * Looks up a user's occupant info by name.
      *