diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/ChatModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/ChatModule.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs index f854409..30c1397 100644 --- a/OpenSim/Region/Environment/Modules/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/ChatModule.cs | |||
@@ -29,9 +29,11 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Net.Sockets; | 31 | using System.Net.Sockets; |
32 | using System.Reflection; | ||
32 | using System.Text.RegularExpressions; | 33 | using System.Text.RegularExpressions; |
33 | using System.Threading; | 34 | using System.Threading; |
34 | using libsecondlife; | 35 | using libsecondlife; |
36 | using log4net; | ||
35 | using Nini.Config; | 37 | using Nini.Config; |
36 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
37 | using OpenSim.Region.Environment.Interfaces; | 39 | using OpenSim.Region.Environment.Interfaces; |
@@ -41,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules | |||
41 | { | 43 | { |
42 | public class ChatModule : IRegionModule, ISimChat | 44 | public class ChatModule : IRegionModule, ISimChat |
43 | { | 45 | { |
44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 47 | ||
46 | private List<Scene> m_scenes = new List<Scene>(); | 48 | private List<Scene> m_scenes = new List<Scene>(); |
47 | 49 | ||
@@ -116,7 +118,7 @@ namespace OpenSim.Region.Environment.Modules | |||
116 | if (!m_irc_connector.IsAlive) | 118 | if (!m_irc_connector.IsAlive) |
117 | { | 119 | { |
118 | m_irc_connector.Start(); | 120 | m_irc_connector.Start(); |
119 | OpenSim.Framework.ThreadTracker.Add(m_irc_connector); | 121 | ThreadTracker.Add(m_irc_connector); |
120 | } | 122 | } |
121 | } | 123 | } |
122 | catch (Exception) | 124 | catch (Exception) |
@@ -267,7 +269,7 @@ namespace OpenSim.Region.Environment.Modules | |||
267 | if (!m_irc_connector.IsAlive) | 269 | if (!m_irc_connector.IsAlive) |
268 | { | 270 | { |
269 | m_irc_connector.Start(); | 271 | m_irc_connector.Start(); |
270 | OpenSim.Framework.ThreadTracker.Add(m_irc_connector); | 272 | ThreadTracker.Add(m_irc_connector); |
271 | } | 273 | } |
272 | } | 274 | } |
273 | catch (Exception) | 275 | catch (Exception) |
@@ -336,7 +338,7 @@ namespace OpenSim.Region.Environment.Modules | |||
336 | 338 | ||
337 | internal class IRCChatModule | 339 | internal class IRCChatModule |
338 | { | 340 | { |
339 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 341 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
340 | 342 | ||
341 | private string m_server = null; | 343 | private string m_server = null; |
342 | private uint m_port = 6668; | 344 | private uint m_port = 6668; |
@@ -431,13 +433,13 @@ namespace OpenSim.Region.Environment.Modules | |||
431 | pingSender.Name = "PingSenderThread"; | 433 | pingSender.Name = "PingSenderThread"; |
432 | pingSender.IsBackground = true; | 434 | pingSender.IsBackground = true; |
433 | pingSender.Start(); | 435 | pingSender.Start(); |
434 | OpenSim.Framework.ThreadTracker.Add(pingSender); | 436 | ThreadTracker.Add(pingSender); |
435 | 437 | ||
436 | listener = new Thread(new ThreadStart(ListenerRun)); | 438 | listener = new Thread(new ThreadStart(ListenerRun)); |
437 | listener.Name = "IRCChatModuleListenerThread"; | 439 | listener.Name = "IRCChatModuleListenerThread"; |
438 | listener.IsBackground = true; | 440 | listener.IsBackground = true; |
439 | listener.Start(); | 441 | listener.Start(); |
440 | OpenSim.Framework.ThreadTracker.Add(listener); | 442 | ThreadTracker.Add(listener); |
441 | 443 | ||
442 | m_writer.WriteLine(m_user); | 444 | m_writer.WriteLine(m_user); |
443 | m_writer.Flush(); | 445 | m_writer.Flush(); |