From f9540e3f110d8bdfe499f3ec93b53dcaecd27216 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Mon, 17 Dec 2007 19:43:48 +0000
Subject: make it so prims don't relay into IRC

---
 OpenSim/Region/Environment/Modules/ChatModule.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'OpenSim')

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
 
             if (e.Message.Length > 0)
             {
-                if (m_irc.Connected)
+                if (m_irc.Connected && (avatar != null)) // this is to keep objects from talking to IRC
                 {
                     m_irc.PrivMsg(fromName, scene.RegionInfo.RegionName, e.Message);
                 }
@@ -301,9 +301,7 @@ namespace OpenSim.Region.Environment.Modules
             Regex RE = new Regex(regex, RegexOptions.Multiline);
             MatchCollection matches = RE.Matches(input);
             // Get some direct matches $1 $4 is a 
-            if ((matches.Count == 1) && (matches[0].Groups.Count == 5) &&
-                (matches[0].Groups[2].Value != "Primitive")
-                )
+            if ((matches.Count == 1) && (matches[0].Groups.Count == 5))
             {
                 result = new Dictionary<string, string>();
                 result.Add("nick", matches[0].Groups[1].Value);
-- 
cgit v1.1