Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 18 insertions, 25 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
index 6ea542c..a3ef83b 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
@@ -389,39 +389,32 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             }
 
             m_log.DebugFormat("[IRC-Region {0}] heard on channel {1} : {2}", Region, msg.Channel, msg.Message);
-            string txt = msg.Message;
 
-            if (null != avatar)
+            if (null != avatar && cs.RelayChat && (msg.Channel == 0 || msg.Channel == DEBUG_CHANNEL))
             {
-                if ((!cs.RelayChat) || (msg.Channel != 0 && msg.Channel != DEBUG_CHANNEL))
-                    return;
+                string txt = msg.Message;
+                if (txt.StartsWith("/me "))
+                    txt = String.Format("{0} {1}", fromName, msg.Message.Substring(4));
+
+                cs.irc.PrivMsg(cs.PrivateMessageFormat, fromName, Region, txt);
+                return;
             }
-            else
+
+            if (null == avatar && cs.RelayPrivateChannels && null != cs.AccessPassword &&
+                msg.Channel == cs.RelayChannelOut)
             {
-                if (cs.RelayPrivateChannels && msg.Channel == cs.RelayChannelOut)
+                Match m = cs.AccessPasswordRegex.Match(msg.Message);
+                if (null != m)
                 {
-                    if (null != cs.AccessPassword)
-                    {
-                        Match m = cs.AccessPasswordRegex.Match(msg.Message);
-                        if (null != m)
-                        {
-                            if (m.Groups["avatar"].ToString() != "")
-                                fromName = m.Groups["avatar"].ToString();
-                            if (m.Groups["message"].ToString() != "")
-                                txt = m.Groups["message"].ToString();
-                        }
-                    }
+                    m_log.DebugFormat("[IRC] relaying message from {0}: {1}", m.Groups["avatar"].ToString(),
+                                      m.Groups["message"].ToString());
+                    cs.irc.PrivMsg(cs.PrivateMessageFormat, m.Groups["avatar"].ToString(),
+                                   scene.RegionInfo.RegionName, m.Groups["message"].ToString());
                 }
-                fromName = "OBJECT: " + fromName;
             }
-
-            if (txt.StartsWith("/me "))
-                txt = String.Format("{0} {1}", fromName, msg.Message.Substring(4));
-            m_log.DebugFormat("[IRC] relaying message from {0}: {1}", fromName, txt);
-            cs.irc.PrivMsg(cs.PrivateMessageFormat, fromName, Region, txt);
         }
 
-        // This method gives the region an opportunity to interfere with 
+        // This method gives the region an opportunity to interfere with
         // message delivery. For now we just enforce the enable/disable
         // flag.
 
@@ -435,7 +428,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             }
         }
 
-        // This supports any local message traffic that might be needed in 
+        // This supports any local message traffic that might be needed in
         // support of command processing. At present there is none.
 
         internal void LocalChat(string msg)