diff options
author | Melanie | 2009-10-12 15:12:15 +0100 |
---|---|---|
committer | Melanie | 2009-10-12 15:12:15 +0100 |
commit | 70553a979e551efc47f56930282c6b01ff4277e1 (patch) | |
tree | 347632a3f51e7eace08e383f17b7f3e5ad218610 /OpenSim/Region/ClientStack/LindenUDP | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Optimize ODE mesh by removing sleep. On a region with 100,000 prims and ODE e... (diff) | |
download | opensim-SC_OLD-70553a979e551efc47f56930282c6b01ff4277e1.zip opensim-SC_OLD-70553a979e551efc47f56930282c6b01ff4277e1.tar.gz opensim-SC_OLD-70553a979e551efc47f56930282c6b01ff4277e1.tar.bz2 opensim-SC_OLD-70553a979e551efc47f56930282c6b01ff4277e1.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 0390277..c356f02 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -189,7 +189,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
189 | LLUDPClient udpClient; | 189 | LLUDPClient udpClient; |
190 | if (clients.TryGetValue(client.AgentId, out udpClient)) | 190 | if (clients.TryGetValue(client.AgentId, out udpClient)) |
191 | { | 191 | { |
192 | m_log.Debug("[LLUDPSERVER]: Removing LLUDPClient for " + client.Name); | 192 | m_log.Debug("[LLUDPSERVER]: Removing LLUDPClient for " + client.Name + " in " + m_scene.RegionInfo.RegionName); |
193 | udpClient.Shutdown(); | 193 | udpClient.Shutdown(); |
194 | clients.Remove(client.AgentId, udpClient.RemoteEndPoint); | 194 | clients.Remove(client.AgentId, udpClient.RemoteEndPoint); |
195 | } | 195 | } |
@@ -525,7 +525,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
525 | // Determine which agent this packet came from | 525 | // Determine which agent this packet came from |
526 | if (!clients.TryGetValue(address, out client)) | 526 | if (!clients.TryGetValue(address, out client)) |
527 | { | 527 | { |
528 | m_log.Warn("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address); | 528 | m_log.Warn("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); |
529 | return; | 529 | return; |
530 | } | 530 | } |
531 | 531 | ||
@@ -668,6 +668,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
668 | 668 | ||
669 | // Add the new client to our list of tracked clients | 669 | // Add the new client to our list of tracked clients |
670 | clients.Add(agentID, client.RemoteEndPoint, client); | 670 | clients.Add(agentID, client.RemoteEndPoint, client); |
671 | |||
672 | m_log.DebugFormat("[LLUDPSERVER]: Added new client {0} to region {1}", agentID, m_scene.RegionInfo.RegionName); | ||
671 | } | 673 | } |
672 | 674 | ||
673 | private void AcknowledgePacket(LLUDPClient client, uint ack, int currentTime, bool fromResend) | 675 | private void AcknowledgePacket(LLUDPClient client, uint ack, int currentTime, bool fromResend) |