aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index c807260..a662092 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -720,6 +720,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
720 IClientAPI client; 720 IClientAPI client;
721 if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView)) 721 if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView))
722 { 722 {
723<<<<<<< HEAD
724 m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
725=======
723 lock (m_pendingCache) 726 lock (m_pendingCache)
724 { 727 {
725 Queue<UDPPacketBuffer> queue; 728 Queue<UDPPacketBuffer> queue;
@@ -734,6 +737,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
734 } 737 }
735 } 738 }
736 739
740<<<<<<< HEAD
741// m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
742>>>>>>> 2606484e45138adef289386509b1e27552a32aee
743=======
744>>>>>>> 0baa1b557af20af3590737dc04294a9bdc8e8728
737 return; 745 return;
738 } 746 }
739 747
@@ -741,7 +749,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
741 749
742 if (!udpClient.IsConnected) 750 if (!udpClient.IsConnected)
743 { 751 {
744// m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName); 752 m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName);
745 return; 753 return;
746 } 754 }
747 755