From dd0fa5745ea8abf80a6e4631d8f682034887e014 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Mon, 20 Apr 2009 17:24:09 +0000 Subject: [PATCH] It is possible that apacket is recieved before the clint stack is fully ready. This causes a nullref we need to catch here. --- OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs index 169bab2a0c..75f4e1d5f4 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs @@ -210,6 +210,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP int threshold; if (m_lastloopprocessed == 0) { + if (m_client.PacketHandler == null || m_client.PacketHandler.PacketQueue == null || m_client.PacketHandler.PacketQueue.TextureThrottle == null) + return; //This is decent for a semi fast machine, but we'll calculate it more accurately based on time below threshold = m_client.PacketHandler.PacketQueue.TextureThrottle.Current / 6300; m_lastloopprocessed = DateTime.Now.Ticks;