aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing
diff options
context:
space:
mode:
authorMelanie Thielker2010-08-03 05:25:01 +0200
committerMelanie Thielker2010-08-03 05:25:01 +0200
commitd2d1c63b17a55ed1f324fafff89cfbcbd6618d11 (patch)
tree69950d9e0ed8853f18a9d6ab13ea41eb51377525 /OpenSim/Region/Physics/Meshing
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-d2d1c63b17a55ed1f324fafff89cfbcbd6618d11.zip
opensim-SC_OLD-d2d1c63b17a55ed1f324fafff89cfbcbd6618d11.tar.gz
opensim-SC_OLD-d2d1c63b17a55ed1f324fafff89cfbcbd6618d11.tar.bz2
opensim-SC_OLD-d2d1c63b17a55ed1f324fafff89cfbcbd6618d11.tar.xz
Revert "Catch meshing error in Meshmerizer"
This reverts commit 8f2986bc6a438ea9f5de912a5b76a196e7933175. In favor of a fix that tells us where the issue is instead of eating the error
Diffstat (limited to 'OpenSim/Region/Physics/Meshing')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs22
1 files changed, 7 insertions, 15 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index fb2b462..fded95e 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -336,24 +336,16 @@ namespace OpenSim.Region.Physics.Meshing
336 bool mirror = ((primShape.SculptType & 128) != 0); 336 bool mirror = ((primShape.SculptType & 128) != 0);
337 bool invert = ((primShape.SculptType & 64) != 0); 337 bool invert = ((primShape.SculptType & 64) != 0);
338 338
339 try 339 sculptMesh = new PrimMesher.SculptMesh((Bitmap)idata, sculptType, (int)lod, false, mirror, invert);
340 { 340
341 sculptMesh = new PrimMesher.SculptMesh((Bitmap)idata, sculptType, (int)lod, false, mirror, invert); 341 idata.Dispose();
342
343 idata.Dispose();
344 342
345 sculptMesh.DumpRaw(baseDir, primName, "primMesh"); 343 sculptMesh.DumpRaw(baseDir, primName, "primMesh");
346 344
347 sculptMesh.Scale(size.X, size.Y, size.Z); 345 sculptMesh.Scale(size.X, size.Y, size.Z);
348 346
349 coords = sculptMesh.coords; 347 coords = sculptMesh.coords;
350 faces = sculptMesh.faces; 348 faces = sculptMesh.faces;
351 }
352 catch(Exception ex)
353 {
354 m_log.Error("[Meshing]: Unable to generate a Sculpty mesh. " + ex.Message);
355 return null;
356 }
357 } 349 }
358 else 350 else
359 { 351 {