From 395a8680c3633ca131e7481f765517311ef51710 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 13 Oct 2009 16:53:19 -0700
Subject: * Fixed a bug where clients were being added to ClientManager twice *
 Changed the ClientManager interface to reduce potential errors with duplicate
 or mismatched keys * Added IClientAPI.RemoteEndPoint, which can (hopefully)
 eventually replace IClientAPI.CircuitCode * Changed the order of operations
 during client shutdown

---
 OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 8ec143a..22c275c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -390,7 +390,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-        public void Flush()
+        public void Flush(LLUDPClient udpClient)
         {
             // FIXME: Implement?
         }
@@ -645,15 +645,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 client.OnLogout += LogoutHandler;
                 client.OnConnectionClosed += ConnectionClosedHandler;
 
-                m_scene.ClientManager.Add(agentID, remoteEndPoint, client);
-
                 // Start the IClientAPI
-                m_scene.ClientManager.Add(agentID, remoteEndPoint, client);
+                m_scene.ClientManager.Add(client);
                 client.Start();
             }
             else
             {
-                m_log.Debug("[LLUDPSERVER]: Ignoring a repeated UseCircuitCode from " + udpClient.AgentID);
+                m_log.WarnFormat("[LLUDPSERVER]: Ignoring a repeated UseCircuitCode from {0} at {1} for circuit {2}",
+                    udpClient.AgentID, remoteEndPoint, circuitCode);
             }
         }
 
-- 
cgit v1.1