diff options
author | UbitUmarov | 2016-11-20 13:36:34 +0000 |
---|---|---|
committer | UbitUmarov | 2016-11-20 13:36:34 +0000 |
commit | f1958e9f71f5ba9b8ca088f23df68336a3c7b43c (patch) | |
tree | 2501c6e0f96672d9332efe2d964a47d03664fa95 /OpenSim/Region/ClientStack/Linden | |
parent | HG add a small delay before start sending region data (diff) | |
download | opensim-SC_OLD-f1958e9f71f5ba9b8ca088f23df68336a3c7b43c.zip opensim-SC_OLD-f1958e9f71f5ba9b8ca088f23df68336a3c7b43c.tar.gz opensim-SC_OLD-f1958e9f71f5ba9b8ca088f23df68336a3c7b43c.tar.bz2 opensim-SC_OLD-f1958e9f71f5ba9b8ca088f23df68336a3c7b43c.tar.xz |
revert more object references removal on clients close because 2 many code paths don't have proper abort
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 5879e56..65a341e 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -606,11 +606,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
606 | //m_scene.CloseAllAgents(CircuitCode); | 606 | //m_scene.CloseAllAgents(CircuitCode); |
607 | 607 | ||
608 | // Disable UDP handling for this client | 608 | // Disable UDP handling for this client |
609 | m_udpClient.Shutdown(); | ||
610 | |||
611 | m_udpClient.OnQueueEmpty -= HandleQueueEmpty; | 609 | m_udpClient.OnQueueEmpty -= HandleQueueEmpty; |
612 | m_udpClient.HasUpdates -= HandleHasUpdates; | 610 | m_udpClient.HasUpdates -= HandleHasUpdates; |
613 | m_udpClient.OnPacketStats -= PopulateStats; | 611 | m_udpClient.OnPacketStats -= PopulateStats; |
612 | m_udpClient.Shutdown(); | ||
614 | 613 | ||
615 | // Shutdown the image manager | 614 | // Shutdown the image manager |
616 | ImageManager.Close(); | 615 | ImageManager.Close(); |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs index c804e33..dc8ac3c 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | |||
@@ -288,15 +288,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
288 | for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++) | 288 | for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++) |
289 | { | 289 | { |
290 | m_packetOutboxes[i].Clear(); | 290 | m_packetOutboxes[i].Clear(); |
291 | m_throttleCategories[i] = null; | ||
292 | m_nextPackets[i] = null; | 291 | m_nextPackets[i] = null; |
293 | } | 292 | } |
294 | 293 | ||
295 | // pull the throttle out of the scene throttle | 294 | // pull the throttle out of the scene throttle |
296 | m_throttleClient.Parent.UnregisterRequest(m_throttleClient); | 295 | m_throttleClient.Parent.UnregisterRequest(m_throttleClient); |
297 | m_throttleClient = null; | ||
298 | OnPacketStats = null; | ||
299 | OnQueueEmpty = null; | ||
300 | PendingAcks.Clear(); | 296 | PendingAcks.Clear(); |
301 | NeedAcks.Clear(); | 297 | NeedAcks.Clear(); |
302 | } | 298 | } |