OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

revert more object references removal on clients close because 2 many code paths don't have proper abort

melanie
UbitUmarov 2016-11-20 13:36:34 +00:00
parent 902e8019de
commit f1958e9f71
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -606,11 +606,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//m_scene.CloseAllAgents(CircuitCode); //m_scene.CloseAllAgents(CircuitCode);
// Disable UDP handling for this client // Disable UDP handling for this client
m_udpClient.Shutdown();
m_udpClient.OnQueueEmpty -= HandleQueueEmpty; m_udpClient.OnQueueEmpty -= HandleQueueEmpty;
m_udpClient.HasUpdates -= HandleHasUpdates; m_udpClient.HasUpdates -= HandleHasUpdates;
m_udpClient.OnPacketStats -= PopulateStats; m_udpClient.OnPacketStats -= PopulateStats;
m_udpClient.Shutdown();
// Shutdown the image manager // Shutdown the image manager
ImageManager.Close(); ImageManager.Close();

4
OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
View File

@ -288,15 +288,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++) for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++)
{ {
m_packetOutboxes[i].Clear(); m_packetOutboxes[i].Clear();
m_throttleCategories[i] = null;
m_nextPackets[i] = null; m_nextPackets[i] = null;
} }
// pull the throttle out of the scene throttle // pull the throttle out of the scene throttle
m_throttleClient.Parent.UnregisterRequest(m_throttleClient); m_throttleClient.Parent.UnregisterRequest(m_throttleClient);
m_throttleClient = null;
OnPacketStats = null;
OnQueueEmpty = null;
PendingAcks.Clear(); PendingAcks.Clear();
NeedAcks.Clear(); NeedAcks.Clear();
} }