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

remove some potencial null refs i did add in last days :(

melanie
UbitUmarov 2016-11-19 21:06:42 +00:00
parent 28f7d429fc
commit 8010413e64
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -620,7 +620,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_entityProps = null; m_entityProps = null;
m_killRecord.Clear(); m_killRecord.Clear();
GroupsInView.Clear(); GroupsInView.Clear();
m_scene = null; // m_scene = null; can't do this unless checks are added everywhere due to workitems already in pools
//m_log.InfoFormat("[CLIENTVIEW] Memory pre GC {0}", System.GC.GetTotalMemory(false)); //m_log.InfoFormat("[CLIENTVIEW] Memory pre GC {0}", System.GC.GetTotalMemory(false));
//GC.Collect(); //GC.Collect();
//m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true)); //m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true));
@ -4371,7 +4372,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ushort timeDilation; ushort timeDilation;
if(m_scene == null) if(!IsActive)
return; return;
timeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f); timeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);
@ -12945,6 +12946,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// provide your own method.</param> /// provide your own method.</param>
protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting, UnackedPacketMethod method) protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting, UnackedPacketMethod method)
{ {
if(!IsActive)
return;
if (m_outPacketsToDrop != null) if (m_outPacketsToDrop != null)
if (m_outPacketsToDrop.Contains(packet.Type.ToString())) if (m_outPacketsToDrop.Contains(packet.Type.ToString()))
return; return;

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

@ -299,10 +299,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OnQueueEmpty = null; OnQueueEmpty = null;
PendingAcks.Clear(); PendingAcks.Clear();
NeedAcks.Clear(); NeedAcks.Clear();
NeedAcks = null;
PendingAcks = null;
m_nextPackets = null; m_nextPackets = null;
m_packetOutboxes = null;
} }
/// <summary> /// <summary>