aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs19
1 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
index 8fe5080..215c8d9 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
@@ -92,8 +92,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
92 if (!m_scenes.Contains(scene)) 92 if (!m_scenes.Contains(scene))
93 { 93 {
94 m_scenes.Add(scene); 94 m_scenes.Add(scene);
95 scene.EventManager.OnNewClient += NewClient; 95 scene.EventManager.OnNewClient += OnNewClient;
96 scene.EventManager.OnChatFromWorld += SimChat; 96 scene.EventManager.OnChatFromWorld += OnSimChat;
97 scene.EventManager.OnMakeRootAgent += OnMakeRootAgent; 97 scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
98 scene.EventManager.OnMakeChildAgent += OnMakeChildAgent; 98 scene.EventManager.OnMakeChildAgent += OnMakeChildAgent;
99 } 99 }
@@ -171,7 +171,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
171 171
172 #region ISimChat Members 172 #region ISimChat Members
173 173
174 public void SimChat(Object sender, OSChatMessage e) 174 public void OnSimChat(Object sender, OSChatMessage e)
175 { 175 {
176 // We only want to relay stuff on channel 0 176 // We only want to relay stuff on channel 0
177 if (e.Channel != 0) return; 177 if (e.Channel != 0) return;
@@ -233,15 +233,15 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
233 233
234 #endregion 234 #endregion
235 235
236 public void NewClient(IClientAPI client) 236 public void OnNewClient(IClientAPI client)
237 { 237 {
238 try 238 try
239 { 239 {
240 string clientName = String.Format("{0} {1}", client.FirstName, client.LastName); 240 string clientName = String.Format("{0} {1}", client.FirstName, client.LastName);
241 241
242 client.OnChatFromViewer += SimChat; 242 client.OnChatFromViewer += OnSimChat;
243 client.OnLogout += ClientLoggedOut; 243 client.OnLogout += OnClientLoggedOut;
244 client.OnConnectionClosed += ClientLoggedOut; 244 client.OnConnectionClosed += OnClientLoggedOut;
245 245
246 if (clientName != m_last_new_user) 246 if (clientName != m_last_new_user)
247 { 247 {
@@ -295,7 +295,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
295 } 295 }
296 296
297 297
298 public void ClientLoggedOut(IClientAPI client) 298 public void OnClientLoggedOut(IClientAPI client)
299 { 299 {
300 lock (m_syncLogout) 300 lock (m_syncLogout)
301 { 301 {
@@ -614,10 +614,11 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
614 } 614 }
615 } 615 }
616 616
617 static private Vector3 pos = new Vector3(128, 128, 20);
617 public void ListenerRun() 618 public void ListenerRun()
618 { 619 {
619 string inputLine; 620 string inputLine;
620 Vector3 pos = new Vector3(128, 128, 20); 621
621 while (m_enabled) 622 while (m_enabled)
622 { 623 {
623 try 624 try