From 70eb37433d4cc7512ebe6cac1d7c288c9b1db06f Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 18 Nov 2016 03:40:34 +0000 Subject: [PATCH] avoid a null ref. (needs better way) --- OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 37937123b4..8ba26e83f9 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -4371,6 +4371,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP ushort timeDilation; + if(m_scene == null) + return; + timeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f); if (terseAgentUpdateBlocks.Count > 0) @@ -4632,6 +4635,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP void HandleQueueEmpty(ThrottleOutPacketTypeFlags categories) { + if(m_scene == null) + return; + if ((categories & ThrottleOutPacketTypeFlags.Task) != 0) { int maxUpdateBytes = m_udpClient.GetCatBytesCanSend(ThrottleOutPacketType.Task, 30);