aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-28 01:48:53 -0700
committerJohn Hurliman2009-10-28 01:48:53 -0700
commit2d470f8bde768e97eb9bd031c945b868931221fd (patch)
tree714561729fa749a53119e35ea174f05483640d76
parentPrint the exception message when CSJ2K decoding fails for sculpty textures (diff)
downloadopensim-SC_OLD-2d470f8bde768e97eb9bd031c945b868931221fd.zip
opensim-SC_OLD-2d470f8bde768e97eb9bd031c945b868931221fd.tar.gz
opensim-SC_OLD-2d470f8bde768e97eb9bd031c945b868931221fd.tar.bz2
opensim-SC_OLD-2d470f8bde768e97eb9bd031c945b868931221fd.tar.xz
Switching sculpty from CSJ2K back to OpenJPEG for now until more kinks are ironed out
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index ed93b3a..fded95e 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -284,9 +284,13 @@ namespace OpenSim.Region.Physics.Meshing
284 284
285 try 285 try
286 { 286 {
287 idata = CSJ2K.J2kImage.FromBytes(primShape.SculptData); 287 OpenMetaverse.Imaging.ManagedImage unusedData;
288 OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(primShape.SculptData, out unusedData, out idata);
289 unusedData = null;
288 290
289 if (cacheSculptMaps) 291 //idata = CSJ2K.J2kImage.FromBytes(primShape.SculptData);
292
293 if (cacheSculptMaps && idata != null)
290 { 294 {
291 try { idata.Save(decodedSculptFileName, ImageFormat.MemoryBmp); } 295 try { idata.Save(decodedSculptFileName, ImageFormat.MemoryBmp); }
292 catch (Exception e) { m_log.Error("[SCULPT]: unable to cache sculpt map " + decodedSculptFileName + " " + e.Message); } 296 catch (Exception e) { m_log.Error("[SCULPT]: unable to cache sculpt map " + decodedSculptFileName + " " + e.Message); }