aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-09-18 01:43:22 +0100
committerJustin Clark-Casey (justincc)2010-09-18 01:43:22 +0100
commit889923841c3d3500dfe12c281ffe2d6bb3898739 (patch)
tree22118e7da3c4b58ceb7d51692f7c5e2eb845be6b
parentMove OpenSim/Framework/tests/PrimeNumberHelperTests.cs to OpenSim/Framework/T... (diff)
downloadopensim-SC_OLD-889923841c3d3500dfe12c281ffe2d6bb3898739.zip
opensim-SC_OLD-889923841c3d3500dfe12c281ffe2d6bb3898739.tar.gz
opensim-SC_OLD-889923841c3d3500dfe12c281ffe2d6bb3898739.tar.bz2
opensim-SC_OLD-889923841c3d3500dfe12c281ffe2d6bb3898739.tar.xz
Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatars
This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 02f0968..ef5efdd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -237,9 +237,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
237 237
238 public virtual void OnChatBroadcast(Object sender, OSChatMessage c) 238 public virtual void OnChatBroadcast(Object sender, OSChatMessage c)
239 { 239 {
240 // unless the chat to be broadcast is of type Region, we 240 if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL) return;
241 // drop it if its channel is neither 0 nor DEBUG_CHANNEL
242 if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL && c.Type != ChatTypeEnum.Region) return;
243 241
244 ChatTypeEnum cType = c.Type; 242 ChatTypeEnum cType = c.Type;
245 if (c.Channel == DEBUG_CHANNEL) 243 if (c.Channel == DEBUG_CHANNEL)