aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-09-30 22:21:22 +0100
committerMelanie2009-09-30 22:21:22 +0100
commit041aaaa62c49772a03abb068eb7c83e1ca661385 (patch)
tree2786559bb186cfdd352a9e7cc31ca2b713322941
parentLimit the number of packet data blocks to 50, as packets are already limited (diff)
downloadopensim-SC_OLD-041aaaa62c49772a03abb068eb7c83e1ca661385.zip
opensim-SC_OLD-041aaaa62c49772a03abb068eb7c83e1ca661385.tar.gz
opensim-SC_OLD-041aaaa62c49772a03abb068eb7c83e1ca661385.tar.bz2
opensim-SC_OLD-041aaaa62c49772a03abb068eb7c83e1ca661385.tar.xz
Prevent null data being sent to the decoder
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs7
1 files 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
350 { 350 {
351 J2KDecodedCallback(m_requestedUUID, new OpenJPEG.J2KLayerInfo[0]); 351 J2KDecodedCallback(m_requestedUUID, new OpenJPEG.J2KLayerInfo[0]);
352 } 352 }
353 // Send it off to the jpeg decoder 353 else
354 m_j2kDecodeModule.BeginDecode(m_requestedUUID, Data, J2KDecodedCallback); 354 {
355 // Send it off to the jpeg decoder
356 m_j2kDecodeModule.BeginDecode(m_requestedUUID, Data, J2KDecodedCallback);
357 }
355 358
356 } 359 }
357 else 360 else