* Move the ResetChildPrimPhysics() calls to after physics have been applied to the parts rather than after each individual part
* From looking at the code there shouldn't be any difference, and this appears to speed up prim loading and make a certain failure case (where prims seem to be going out of bounds on startup) less of a problem. * However, if I've been bad please revert this patch0.6.0-stable
parent
3f1dbae8e4
commit
90ec9c46d5
|
@ -1093,11 +1093,11 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
{
|
{
|
||||||
part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_physicalPrim);
|
part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_physicalPrim);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Hack to get the physics scene geometries in the right spot
|
// Hack to get the physics scene geometries in the right spot
|
||||||
ResetChildPrimPhysicsPositions();
|
ResetChildPrimPhysicsPositions();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_physicalPrim);
|
m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_physicalPrim);
|
||||||
|
|
Loading…
Reference in New Issue