From f5cad91578d9f7dbfb54d17bb476929e935682a8 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Mon, 26 Oct 2009 19:03:55 -0700
Subject: * Switched from OpenJPEG to CSJ2K in Meshmerizer * Tested the
 previous patch and found no regressions

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'OpenSim/Region/Physics')

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index a90a89a..fbe1949 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -31,7 +31,6 @@ using System.Collections.Generic;
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
 using OpenMetaverse;
-using OpenMetaverse.Imaging;
 using System.Drawing;
 using System.Drawing.Imaging;
 using PrimMesher;
@@ -285,8 +284,7 @@ namespace OpenSim.Region.Physics.Meshing
 
                     try
                     {
-                        ManagedImage managedImage;  // we never use this
-                        OpenJPEG.DecodeToImage(primShape.SculptData, out managedImage, out idata);
+                        idata = CSJ2K.J2kImage.FromBytes(primShape.SculptData);
 
                         if (cacheSculptMaps)
                         {
-- 
cgit v1.1