OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Switched from OpenJPEG to CSJ2K in Meshmerizer 

* Tested the previous patch and found no regressions
0.6.8-post-fixes
John Hurliman 2009-10-26 19:03:55 -07:00
parent d199767e69
commit f5cad91578
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -31,7 +31,6 @@ using System.Collections.Generic;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Imaging;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using PrimMesher; using PrimMesher;
@ -285,8 +284,7 @@ namespace OpenSim.Region.Physics.Meshing
try try
{ {
ManagedImage managedImage; // we never use this idata = CSJ2K.J2kImage.FromBytes(primShape.SculptData);
OpenJPEG.DecodeToImage(primShape.SculptData, out managedImage, out idata);
if (cacheSculptMaps) if (cacheSculptMaps)
{ {