aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs')
-rw-r--r--OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs6
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
index d5df7a2..c339ec5 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
@@ -368,9 +368,6 @@ namespace OpenSim.Capabilities.Handlers
368 try 368 try
369 { 369 {
370 // Taking our jpeg2000 data, decoding it, then saving it to a byte array with regular data 370 // Taking our jpeg2000 data, decoding it, then saving it to a byte array with regular data
371
372 imgstream = new MemoryStream();
373
374 // Decode image to System.Drawing.Image 371 // Decode image to System.Drawing.Image
375 if (OpenJPEG.DecodeToImage(texture.Data, out managedImage, out image) && image != null) 372 if (OpenJPEG.DecodeToImage(texture.Data, out managedImage, out image) && image != null)
376 { 373 {
@@ -412,10 +409,7 @@ namespace OpenSim.Capabilities.Handlers
412 managedImage.Clear(); 409 managedImage.Clear();
413 410
414 if (imgstream != null) 411 if (imgstream != null)
415 {
416 imgstream.Close();
417 imgstream.Dispose(); 412 imgstream.Dispose();
418 }
419 } 413 }
420 414
421 return data; 415 return data;