diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 4 |
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) |