Reverting my last two commits, putting back Melanie's exception handler. Doesn't solve #4777.

1 files changed, 10 insertions, 1 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index f84c505..100f98d 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1772,7 +1772,16 @@ namespace OpenSim.Region.Physics.OdePlugin
 
             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}.", primName);
+                    m_log.Debug(e.ToString());
+                    mesh = null;
+                }
             }
 
             result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical);