diff options
author | John Hurliman | 2009-10-26 19:03:55 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-26 19:03:55 -0700 |
commit | f5cad91578d9f7dbfb54d17bb476929e935682a8 (patch) | |
tree | 7f167398ad366c5c3750dc341d095f881479a91b /OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |
parent | Experimental change of PhysicsVector to Vector3. Untested (diff) | |
download | opensim-SC_OLD-f5cad91578d9f7dbfb54d17bb476929e935682a8.zip opensim-SC_OLD-f5cad91578d9f7dbfb54d17bb476929e935682a8.tar.gz opensim-SC_OLD-f5cad91578d9f7dbfb54d17bb476929e935682a8.tar.bz2 opensim-SC_OLD-f5cad91578d9f7dbfb54d17bb476929e935682a8.tar.xz |
* Switched from OpenJPEG to CSJ2K in Meshmerizer
* Tested the previous patch and found no regressions
Diffstat (limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 4 |
1 files changed, 1 insertions, 3 deletions
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; | |||
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.Physics.Manager; | 32 | using OpenSim.Region.Physics.Manager; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenMetaverse.Imaging; | ||
35 | using System.Drawing; | 34 | using System.Drawing; |
36 | using System.Drawing.Imaging; | 35 | using System.Drawing.Imaging; |
37 | using PrimMesher; | 36 | using PrimMesher; |
@@ -285,8 +284,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
285 | 284 | ||
286 | try | 285 | try |
287 | { | 286 | { |
288 | ManagedImage managedImage; // we never use this | 287 | idata = CSJ2K.J2kImage.FromBytes(primShape.SculptData); |
289 | OpenJPEG.DecodeToImage(primShape.SculptData, out managedImage, out idata); | ||
290 | 288 | ||
291 | if (cacheSculptMaps) | 289 | if (cacheSculptMaps) |
292 | { | 290 | { |