Merge branch 'master' into careminster-presence-refactor
commit
d2342319da
|
@ -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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue