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

Switching sculpty from CSJ2K back to OpenJPEG for now until more kinks are ironed out

0.6.8-post-fixes
John Hurliman 2009-10-28 01:48:53 -07:00
parent e31024f08b
commit 2d470f8bde
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,9 +284,13 @@ namespace OpenSim.Region.Physics.Meshing
try try
{ {
idata = CSJ2K.J2kImage.FromBytes(primShape.SculptData); OpenMetaverse.Imaging.ManagedImage unusedData;
OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(primShape.SculptData, out unusedData, out idata);
unusedData = null;
if (cacheSculptMaps) //idata = CSJ2K.J2kImage.FromBytes(primShape.SculptData);
if (cacheSculptMaps && idata != null)
{ {
try { idata.Save(decodedSculptFileName, ImageFormat.MemoryBmp); } try { idata.Save(decodedSculptFileName, ImageFormat.MemoryBmp); }
catch (Exception e) { m_log.Error("[SCULPT]: unable to cache sculpt map " + decodedSculptFileName + " " + e.Message); } catch (Exception e) { m_log.Error("[SCULPT]: unable to cache sculpt map " + decodedSculptFileName + " " + e.Message); }