From f1958e9f71f5ba9b8ca088f23df68336a3c7b43c Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Sun, 20 Nov 2016 13:36:34 +0000
Subject: [PATCH] revert more object references removal on clients close
 because 2 many code paths don't have proper abort

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 3 +--
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs  | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 5879e56668..65a341e274 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
             //m_scene.CloseAllAgents(CircuitCode);
 
             // Disable UDP handling for this client
-            m_udpClient.Shutdown();
-
             m_udpClient.OnQueueEmpty -= HandleQueueEmpty;
             m_udpClient.HasUpdates -= HandleHasUpdates;
             m_udpClient.OnPacketStats -= PopulateStats;
+            m_udpClient.Shutdown();
 
             // Shutdown the image manager
             ImageManager.Close();
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index c804e3305e..dc8ac3c41c 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
             for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++)
             {
                 m_packetOutboxes[i].Clear();
-                m_throttleCategories[i] = null;
                 m_nextPackets[i] = null;
             }
 
             // pull the throttle out of the scene throttle
             m_throttleClient.Parent.UnregisterRequest(m_throttleClient);
-            m_throttleClient = null;
-            OnPacketStats = null;
-            OnQueueEmpty = null;
             PendingAcks.Clear();
             NeedAcks.Clear();
          }