aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Avatar/Chat
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-04 21:26:40 +0000
committerJustin Clarke Casey2008-11-04 21:26:40 +0000
commit09dabb2aec0ebfd4bc53a18affe091b25f4ba041 (patch)
tree54d6835a043ba0f1c0e5cd550676e780bc694f03 /OpenSim/Region/Environment/Modules/Avatar/Chat
parent* Stop an exception in getting assets for the archiver from crashing the sim (diff)
downloadopensim-SC-09dabb2aec0ebfd4bc53a18affe091b25f4ba041.zip
opensim-SC-09dabb2aec0ebfd4bc53a18affe091b25f4ba041.tar.gz
opensim-SC-09dabb2aec0ebfd4bc53a18affe091b25f4ba041.tar.bz2
opensim-SC-09dabb2aec0ebfd4bc53a18affe091b25f4ba041.tar.xz
* Prevent texture sender thread termination from immediately crashing the sim
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/Chat')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
index b9422f3..3ebb226 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
@@ -371,7 +371,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
371 371
372 public void Reconnect() 372 public void Reconnect()
373 { 373 {
374
375 m_log.DebugFormat("[IRC-Connector-{0}]: Reconnect request for {1} on {2}:{3}", idn, m_nick, m_server, m_ircChannel); 374 m_log.DebugFormat("[IRC-Connector-{0}]: Reconnect request for {1} on {2}:{3}", idn, m_nick, m_server, m_ircChannel);
376 375
377 // Don't do this if a Connect is in progress... 376 // Don't do this if a Connect is in progress...
@@ -518,7 +517,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
518 } 517 }
519 518
520 if (m_enabled) Reconnect(); 519 if (m_enabled) Reconnect();
521
522 } 520 }
523 521
524 private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)", 522 private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)",