From b2e5f039421ea6c9843c78ae91fa17ada29f724c Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Mon, 13 Apr 2009 14:52:23 +0000
Subject: catch for a null asset so we don't get an exception here, though this
 probably just makes the decoder break somewhere else.

---
 OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index d8cf9a7..54be807 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -85,7 +85,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public byte[] Data
         {
-            get { return m_asset.Data; }
+            get 
+            { 
+                if (m_asset != null) 
+                    return m_asset.Data; 
+                else
+                    return null;
+            }
         }
 
         public ushort TexturePacketCount()
-- 
cgit v1.1