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

0.7-release
Diva Canto 2010-06-19 09:25:36 -07:00
parent 2b76dba593
commit 9b410f5e94
1 changed files with 10 additions and 1 deletions

View File

@ -1771,9 +1771,18 @@ namespace OpenSim.Region.Physics.OdePlugin
IMesh mesh = null; IMesh mesh = null;
if (needsMeshing(pbs)) if (needsMeshing(pbs))
{
try
{ {
mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical); 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); result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical);