fix active objects count down, a path at least

httptests
UbitUmarov 2017-04-16 03:39:35 +01:00
parent b52f7b9203
commit 9354e60df0
1 changed files with 7 additions and 2 deletions

View File

@ -549,6 +549,8 @@ namespace OpenSim.Region.Framework.Scenes
// that are part of the Scene Object being removed // that are part of the Scene Object being removed
m_numTotalPrim -= grp.PrimCount; m_numTotalPrim -= grp.PrimCount;
bool isPh = (grp.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics;
int nphysparts = 0;
// Go through all parts (primitives and meshes) of this Scene Object // Go through all parts (primitives and meshes) of this Scene Object
foreach (SceneObjectPart part in grp.Parts) foreach (SceneObjectPart part in grp.Parts)
{ {
@ -559,10 +561,13 @@ namespace OpenSim.Region.Framework.Scenes
m_numMesh--; m_numMesh--;
else else
m_numPrim--; m_numPrim--;
if(isPh && part.PhysicsShapeType != (byte)PhysShapeType.none)
nphysparts++;
} }
if ((grp.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics) if (nphysparts > 0 )
RemovePhysicalPrim(grp.PrimCount); RemovePhysicalPrim(nphysparts);
} }
bool ret = Entities.Remove(uuid); bool ret = Entities.Remove(uuid);