diff options
author | Sean Dague | 2008-04-14 14:49:16 +0000 |
---|---|---|
committer | Sean Dague | 2008-04-14 14:49:16 +0000 |
commit | 1f5eb2ef65436b948c345dc478893ed801d55995 (patch) | |
tree | 018f10280d4b1b99a02d9c6474840e0f1e93ac00 /OpenSim/Region/Environment/Modules | |
parent | Possible fix for the 100% CPU issue. I've not fully (diff) | |
download | opensim-SC-1f5eb2ef65436b948c345dc478893ed801d55995.zip opensim-SC-1f5eb2ef65436b948c345dc478893ed801d55995.tar.gz opensim-SC-1f5eb2ef65436b948c345dc478893ed801d55995.tar.bz2 opensim-SC-1f5eb2ef65436b948c345dc478893ed801d55995.tar.xz |
make it so the IRC bridge only relays channel 0 messages
not all of them (like it was doing before)
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r-- | OpenSim/Region/Environment/Modules/ChatModule.cs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs index 08c0a11..f854409 100644 --- a/OpenSim/Region/Environment/Modules/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/ChatModule.cs | |||
@@ -275,16 +275,19 @@ namespace OpenSim.Region.Environment.Modules | |||
275 | } | 275 | } |
276 | } | 276 | } |
277 | 277 | ||
278 | if (e.Message.Length > 0) | ||
279 | { | ||
280 | if (m_irc.Connected && (avatar != null)) // this is to keep objects from talking to IRC | ||
281 | { | ||
282 | m_irc.PrivMsg(fromName, scene.RegionInfo.RegionName, e.Message); | ||
283 | } | ||
284 | } | ||
285 | 278 | ||
279 | // We only want to relay stuff on channel 0 | ||
286 | if (e.Channel == 0) | 280 | if (e.Channel == 0) |
287 | { | 281 | { |
282 | // IRC stuff | ||
283 | if (e.Message.Length > 0) | ||
284 | { | ||
285 | if (m_irc.Connected && (avatar != null)) // this is to keep objects from talking to IRC | ||
286 | { | ||
287 | m_irc.PrivMsg(fromName, scene.RegionInfo.RegionName, e.Message); | ||
288 | } | ||
289 | } | ||
290 | |||
288 | foreach (Scene s in m_scenes) | 291 | foreach (Scene s in m_scenes) |
289 | { | 292 | { |
290 | s.ForEachScenePresence(delegate(ScenePresence presence) | 293 | s.ForEachScenePresence(delegate(ScenePresence presence) |