diff options
| author | Melanie | 2010-09-21 04:02:50 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-21 04:02:50 +0100 |
| commit | 2b8c99c2fbbd377cb270087531385bc753932555 (patch) | |
| tree | e0509ae1a72ae1155032241965e4a77c89e5c6f8 /OpenSim/Region/CoreModules | |
| parent | Fix a typo (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-2b8c99c2fbbd377cb270087531385bc753932555.zip opensim-SC_OLD-2b8c99c2fbbd377cb270087531385bc753932555.tar.gz opensim-SC_OLD-2b8c99c2fbbd377cb270087531385bc753932555.tar.bz2 opensim-SC_OLD-2b8c99c2fbbd377cb270087531385bc753932555.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -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 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) |