* 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
This commit is contained in:
John Hurliman
2009-10-13 16:53:19 -07:00
parent 23a334b9f5
commit 395a8680c3
5 changed files with 62 additions and 67 deletions

View File

@@ -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);
}
}