From 041aaaa62c49772a03abb068eb7c83e1ca661385 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 30 Sep 2009 22:21:22 +0100
Subject: Prevent null data being sent to the decoder

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

diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index 06dd28d..d86b123 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -350,8 +350,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             {
                                 J2KDecodedCallback(m_requestedUUID, new OpenJPEG.J2KLayerInfo[0]);
                             }
-                            // Send it off to the jpeg decoder
-                            m_j2kDecodeModule.BeginDecode(m_requestedUUID, Data, J2KDecodedCallback);
+                            else
+                            {
+                                // Send it off to the jpeg decoder
+                                m_j2kDecodeModule.BeginDecode(m_requestedUUID, Data, J2KDecodedCallback);
+                            }
 
                         }
                         else
-- 
cgit v1.1