diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 9b9ccba..a7740b9 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -726,15 +726,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
726 | // If this is a pending connection, enqueue, don't process yet | 726 | // If this is a pending connection, enqueue, don't process yet |
727 | lock (m_pendingCache) | 727 | lock (m_pendingCache) |
728 | { | 728 | { |
729 | <<<<<<< HEAD | ||
730 | <<<<<<< HEAD | ||
731 | m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); | ||
732 | ======= | ||
733 | lock (m_pendingCache) | ||
734 | ======= | ||
735 | Queue<UDPPacketBuffer> queue; | 729 | Queue<UDPPacketBuffer> queue; |
736 | if (m_pendingCache.TryGetValue(address, out queue)) | 730 | if (m_pendingCache.TryGetValue(address, out queue)) |
737 | >>>>>>> 15a1ad393c3748c5c911beac981945a9bd8b200d | ||
738 | { | 731 | { |
739 | //m_log.DebugFormat("[LLUDPSERVER]: Enqueued a {0} packet into the pending queue", packet.Type); | 732 | //m_log.DebugFormat("[LLUDPSERVER]: Enqueued a {0} packet into the pending queue", packet.Type); |
740 | queue.Enqueue(buffer); | 733 | queue.Enqueue(buffer); |
@@ -742,18 +735,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
742 | } | 735 | } |
743 | } | 736 | } |
744 | 737 | ||
745 | <<<<<<< HEAD | ||
746 | <<<<<<< HEAD | ||
747 | // m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); | ||
748 | >>>>>>> 2606484e45138adef289386509b1e27552a32aee | ||
749 | ======= | ||
750 | >>>>>>> 0baa1b557af20af3590737dc04294a9bdc8e8728 | ||
751 | ======= | ||
752 | // Determine which agent this packet came from | 738 | // Determine which agent this packet came from |
753 | if (client == null || !(client is LLClientView)) | 739 | if (client == null || !(client is LLClientView)) |
754 | { | 740 | { |
755 | //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); | 741 | //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); |
756 | >>>>>>> 15a1ad393c3748c5c911beac981945a9bd8b200d | ||
757 | return; | 742 | return; |
758 | } | 743 | } |
759 | 744 | ||