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