From d2d1c63b17a55ed1f324fafff89cfbcbd6618d11 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 3 Aug 2010 05:25:01 +0200
Subject: 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
---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'OpenSim')

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
                 bool mirror = ((primShape.SculptType & 128) != 0);
                 bool invert = ((primShape.SculptType & 64) != 0);
 
-                try
-                {
-                    sculptMesh = new PrimMesher.SculptMesh((Bitmap)idata, sculptType, (int)lod, false, mirror, invert);
-
-                    idata.Dispose();
+                sculptMesh = new PrimMesher.SculptMesh((Bitmap)idata, sculptType, (int)lod, false, mirror, invert);
+                
+                idata.Dispose();
 
-                    sculptMesh.DumpRaw(baseDir, primName, "primMesh");
+                sculptMesh.DumpRaw(baseDir, primName, "primMesh");
 
-                    sculptMesh.Scale(size.X, size.Y, size.Z);
+                sculptMesh.Scale(size.X, size.Y, size.Z);
 
-                    coords = sculptMesh.coords;
-                    faces = sculptMesh.faces;
-                }
-                catch(Exception ex)
-                {
-                    m_log.Error("[Meshing]: Unable to generate a Sculpty mesh. " + ex.Message);
-                    return null;
-                }
+                coords = sculptMesh.coords;
+                faces = sculptMesh.faces;
             }
             else
             {
-- 
cgit v1.1