aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorSean Dague2007-12-17 19:43:48 +0000
committerSean Dague2007-12-17 19:43:48 +0000
commitf9540e3f110d8bdfe499f3ec93b53dcaecd27216 (patch)
tree0fa1c68aae055b51ae13f11cbe3b53ecc7d5c9be /OpenSim/Region
parentignore Primitive for the IRC relay (diff)
downloadopensim-SC_OLD-f9540e3f110d8bdfe499f3ec93b53dcaecd27216.zip
opensim-SC_OLD-f9540e3f110d8bdfe499f3ec93b53dcaecd27216.tar.gz
opensim-SC_OLD-f9540e3f110d8bdfe499f3ec93b53dcaecd27216.tar.bz2
opensim-SC_OLD-f9540e3f110d8bdfe499f3ec93b53dcaecd27216.tar.xz
make it so prims don't relay into IRC
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/ChatModule.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index 3ad68cd..069eb3f 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -165,7 +165,7 @@ namespace OpenSim.Region.Environment.Modules
165 165
166 if (e.Message.Length > 0) 166 if (e.Message.Length > 0)
167 { 167 {
168 if (m_irc.Connected) 168 if (m_irc.Connected && (avatar != null)) // this is to keep objects from talking to IRC
169 { 169 {
170 m_irc.PrivMsg(fromName, scene.RegionInfo.RegionName, e.Message); 170 m_irc.PrivMsg(fromName, scene.RegionInfo.RegionName, e.Message);
171 } 171 }
@@ -301,9 +301,7 @@ namespace OpenSim.Region.Environment.Modules
301 Regex RE = new Regex(regex, RegexOptions.Multiline); 301 Regex RE = new Regex(regex, RegexOptions.Multiline);
302 MatchCollection matches = RE.Matches(input); 302 MatchCollection matches = RE.Matches(input);
303 // Get some direct matches $1 $4 is a 303 // Get some direct matches $1 $4 is a
304 if ((matches.Count == 1) && (matches[0].Groups.Count == 5) && 304 if ((matches.Count == 1) && (matches[0].Groups.Count == 5))
305 (matches[0].Groups[2].Value != "Primitive")
306 )
307 { 305 {
308 result = new Dictionary<string, string>(); 306 result = new Dictionary<string, string>();
309 result.Add("nick", matches[0].Groups[1].Value); 307 result.Add("nick", matches[0].Groups[1].Value);