From d93e0a05037495dcdabdffcc9b9f78747271da39 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 4 Oct 2009 10:30:21 -0700
Subject: Guarding a line that is sometimes throwing a null pointer exception.

---
 OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/ClientStack/LindenUDP')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index 713d43a..19ad0b4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -197,11 +197,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         m_currentPacket = StartPacket;
                     }
 
-                    if (m_imageManager.Client.PacketHandler.GetQueueCount(ThrottleOutPacketType.Texture) == 0)
-                    {
-                        //m_log.Debug("No textures queued, sending one packet to kickstart it");
-                        SendPacket(m_imageManager.Client);
-                    }
+                    if ((m_imageManager != null) && (m_imageManager.Client != null) && (m_imageManager.Client.PacketHandler != null))
+                        if (m_imageManager.Client.PacketHandler.GetQueueCount(ThrottleOutPacketType.Texture) == 0)
+                        {
+                            //m_log.Debug("No textures queued, sending one packet to kickstart it");
+                            SendPacket(m_imageManager.Client);
+                        }
                 }
             }
         }
-- 
cgit v1.1