aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTeravus Ovares2009-04-13 15:18:38 +0000
committerTeravus Ovares2009-04-13 15:18:38 +0000
commit9371df52cbca8b97571ba010147a4d3ed35050cc (patch)
tree16cb8773c1bc141c18482fc61a3b63d787fb0ae8 /OpenSim/Region
parentif Data is null, shortcut to client.SendImageNotFound, as any other (diff)
downloadopensim-SC_OLD-9371df52cbca8b97571ba010147a4d3ed35050cc.zip
opensim-SC_OLD-9371df52cbca8b97571ba010147a4d3ed35050cc.tar.gz
opensim-SC_OLD-9371df52cbca8b97571ba010147a4d3ed35050cc.tar.bz2
opensim-SC_OLD-9371df52cbca8b97571ba010147a4d3ed35050cc.tar.xz
*Bypass J2kDecoder when asset is null
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs4
1 files changed, 4 insertions, 0 deletions
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
304 // Do we have a jpeg decoder? 304 // Do we have a jpeg decoder?
305 if (m_j2kDecodeModule != null) 305 if (m_j2kDecodeModule != null)
306 { 306 {
307 if (Data == null)
308 {
309 J2KDecodedCallback(m_requestedUUID, new OpenJPEG.J2KLayerInfo[0]);
310 }
307 // Send it off to the jpeg decoder 311 // Send it off to the jpeg decoder
308 m_j2kDecodeModule.decode(m_requestedUUID, Data, J2KDecodedCallback); 312 m_j2kDecodeModule.decode(m_requestedUUID, Data, J2KDecodedCallback);
309 313