diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 097f109..bcb45cf 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -779,14 +779,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
779 | IClientAPI client; | 779 | IClientAPI client; |
780 | if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView)) | 780 | if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView)) |
781 | { | 781 | { |
782 | //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); | 782 | // m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); |
783 | return; | 783 | return; |
784 | } | 784 | } |
785 | 785 | ||
786 | udpClient = ((LLClientView)client).UDPClient; | 786 | udpClient = ((LLClientView)client).UDPClient; |
787 | 787 | ||
788 | if (!udpClient.IsConnected) | 788 | if (!udpClient.IsConnected) |
789 | { | ||
790 | // m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName); | ||
789 | return; | 791 | return; |
792 | } | ||
790 | 793 | ||
791 | #endregion Packet to Client Mapping | 794 | #endregion Packet to Client Mapping |
792 | 795 | ||
@@ -1138,7 +1141,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1138 | if (!client.SceneAgent.IsChildAgent) | 1141 | if (!client.SceneAgent.IsChildAgent) |
1139 | client.Kick("Simulator logged you out due to connection timeout"); | 1142 | client.Kick("Simulator logged you out due to connection timeout"); |
1140 | 1143 | ||
1141 | client.Close(); | 1144 | Util.FireAndForget(o => client.Close()); |
1142 | } | 1145 | } |
1143 | 1146 | ||
1144 | private void IncomingPacketHandler() | 1147 | private void IncomingPacketHandler() |
@@ -1149,6 +1152,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1149 | 1152 | ||
1150 | while (base.IsRunning) | 1153 | while (base.IsRunning) |
1151 | { | 1154 | { |
1155 | m_scene.ThreadAlive(1); | ||
1152 | try | 1156 | try |
1153 | { | 1157 | { |
1154 | IncomingPacket incomingPacket = null; | 1158 | IncomingPacket incomingPacket = null; |
@@ -1191,6 +1195,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1191 | 1195 | ||
1192 | while (base.IsRunning) | 1196 | while (base.IsRunning) |
1193 | { | 1197 | { |
1198 | m_scene.ThreadAlive(2); | ||
1194 | try | 1199 | try |
1195 | { | 1200 | { |
1196 | m_packetSent = false; | 1201 | m_packetSent = false; |
@@ -1460,4 +1465,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1460 | } | 1465 | } |
1461 | } | 1466 | } |
1462 | } | 1467 | } |
1463 | } \ No newline at end of file | 1468 | } |