From 9371df52cbca8b97571ba010147a4d3ed35050cc Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Mon, 13 Apr 2009 15:18:38 +0000
Subject: *Bypass J2kDecoder when asset is null

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

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index acb8497..5c5292e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -304,6 +304,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         // Do we have a jpeg decoder?
                         if (m_j2kDecodeModule != null)
                         {
+                            if (Data == null)
+                            {
+                                J2KDecodedCallback(m_requestedUUID, new OpenJPEG.J2KLayerInfo[0]);
+                            }
                             // Send it off to the jpeg decoder
                             m_j2kDecodeModule.decode(m_requestedUUID, Data, J2KDecodedCallback);
 
-- 
cgit v1.1