From ceac35bac1c5ec5f7a39e66492bcef1968e27931 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Sat, 12 Jun 2010 16:25:40 +0100
Subject: [PATCH] Log and eat sculpt meshing exceptions caused by bad jp2 data.

---
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 7984bd9b00..a9e9f5cd1b 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1771,7 +1771,18 @@ namespace OpenSim.Region.Physics.OdePlugin
             IMesh mesh = null;
 
             if (needsMeshing(pbs))
-                mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical);
+            {
+                try
+                {
+                    mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical);
+                }
+                catch(Exception e)
+                {
+                    m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.");
+                    m_log.Debug(e.ToString());
+                    mesh = null;
+                }
+            }
 
             result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical);