apply OtakuMegane code changes to irc channel chat so some characters are not lost

1 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
index b5d9fda..73215cb 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private static Regex arg = new Regex(@"\[[^\[\]]*\]");
+        private static Regex arg = new Regex(@"(?<!\\)\[[^\[\]]*(?<!\\)\]");
         private static int _idk_ = 0;
         private static int DEBUG_CHANNEL = 2147483647;
 
@@ -499,6 +499,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
                 // m_log.DebugFormat("[IRC-Channel] Parse[2]: {0}", result);
             }
 
+            // Now we unescape the literal brackets
+            result = result.Replace(@"\[","[").Replace(@"\]","]");
+
             // m_log.DebugFormat("[IRC-Channel] Parse[3]: {0}", result);
             return result;