aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-11-02 02:23:35 +0000
committerUbitUmarov2015-11-02 02:23:35 +0000
commit89655b0baa1e4ed4e6f0ea301ac087f3c6946f4f (patch)
tree48f2ddf67c11beea15202f62d3472431dec8e9bf /OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
parentfix avatarAppearance wearables copy (diff)
downloadopensim-SC-89655b0baa1e4ed4e6f0ea301ac087f3c6946f4f.zip
opensim-SC-89655b0baa1e4ed4e6f0ea301ac087f3c6946f4f.tar.gz
opensim-SC-89655b0baa1e4ed4e6f0ea301ac087f3c6946f4f.tar.bz2
opensim-SC-89655b0baa1e4ed4e6f0ea301ac087f3c6946f4f.tar.xz
apply OtakuMegane code changes to irc channel chat so some characters are not lost
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs5
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
48 private static readonly ILog m_log = 48 private static readonly ILog m_log =
49 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 49 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 50
51 private static Regex arg = new Regex(@"\[[^\[\]]*\]"); 51 private static Regex arg = new Regex(@"(?<!\\)\[[^\[\]]*(?<!\\)\]");
52 private static int _idk_ = 0; 52 private static int _idk_ = 0;
53 private static int DEBUG_CHANNEL = 2147483647; 53 private static int DEBUG_CHANNEL = 2147483647;
54 54
@@ -499,6 +499,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
499 // m_log.DebugFormat("[IRC-Channel] Parse[2]: {0}", result); 499 // m_log.DebugFormat("[IRC-Channel] Parse[2]: {0}", result);
500 } 500 }
501 501
502 // Now we unescape the literal brackets
503 result = result.Replace(@"\[","[").Replace(@"\]","]");
504
502 // m_log.DebugFormat("[IRC-Channel] Parse[3]: {0}", result); 505 // m_log.DebugFormat("[IRC-Channel] Parse[3]: {0}", result);
503 return result; 506 return result;
504 507