aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Chat
diff options
context:
space:
mode:
authorMelanie2010-09-21 04:03:14 +0100
committerMelanie2010-09-21 04:03:14 +0100
commit9feef34a8144ee7661f8c6207a2a2e432c58eccf (patch)
tree7e04dfd88a6d02ff7fd2b2e45bf0d92d8db90ec8 /OpenSim/Region/CoreModules/Avatar/Chat
parentOverwrite the core version of the string parsing method with ours (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-9feef34a8144ee7661f8c6207a2a2e432c58eccf.zip
opensim-SC_OLD-9feef34a8144ee7661f8c6207a2a2e432c58eccf.tar.gz
opensim-SC_OLD-9feef34a8144ee7661f8c6207a2a2e432c58eccf.tar.bz2
opensim-SC_OLD-9feef34a8144ee7661f8c6207a2a2e432c58eccf.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Chat')
-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 06b1b00..2a590f1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -263,9 +263,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
263 263
264 public virtual void OnChatBroadcast(Object sender, OSChatMessage c) 264 public virtual void OnChatBroadcast(Object sender, OSChatMessage c)
265 { 265 {
266 // unless the chat to be broadcast is of type Region, we 266 if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL) return;
267 // drop it if its channel is neither 0 nor DEBUG_CHANNEL
268 if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL && c.Type != ChatTypeEnum.Region) return;
269 267
270 ChatTypeEnum cType = c.Type; 268 ChatTypeEnum cType = c.Type;
271 if (c.Channel == DEBUG_CHANNEL) 269 if (c.Channel == DEBUG_CHANNEL)