Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

soprefactor
Diva Canto 2010-06-12 11:11:48 -07:00
commit b9c01a1c42
1 changed files with 12 additions and 1 deletions

View File

@ -1771,7 +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}.");
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);