OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim() 

By the time a scheduled update is triggered, a sog may have been removed from the scene.  This change prevents NullReferenceExceptions in these situations.
prebuild-update
Justin Clark-Casey (justincc) 2010-08-26 15:33:42 +01:00
parent 87a6554d4b
commit a6869fbc3e
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Framework/Scenes/Prioritizer.cs
View File

@ -122,9 +122,16 @@ namespace OpenSim.Region.Framework.Scenes
// Use group position for child prims // Use group position for child prims
Vector3 entityPos; Vector3 entityPos;
if (entity is SceneObjectPart) if (entity is SceneObjectPart)
entityPos = m_scene.GetGroupByPrim(entity.LocalId).AbsolutePosition; {
// Can't use Scene.GetGroupByPrim() here, since the entity may have been delete from the scene
// before its scheduled update was triggered
//entityPos = m_scene.GetGroupByPrim(entity.LocalId).AbsolutePosition;
entityPos = ((SceneObjectPart)entity).ParentGroup.AbsolutePosition;
}
else else
{
entityPos = entity.AbsolutePosition; entityPos = entity.AbsolutePosition;
}
return Vector3.DistanceSquared(presencePos, entityPos); return Vector3.DistanceSquared(presencePos, entityPos);
} }
@ -144,9 +151,16 @@ namespace OpenSim.Region.Framework.Scenes
// Use group position for child prims // Use group position for child prims
Vector3 entityPos = entity.AbsolutePosition; Vector3 entityPos = entity.AbsolutePosition;
if (entity is SceneObjectPart) if (entity is SceneObjectPart)
entityPos = m_scene.GetGroupByPrim(entity.LocalId).AbsolutePosition; {
// Can't use Scene.GetGroupByPrim() here, since the entity may have been delete from the scene
// before its scheduled update was triggered
//entityPos = m_scene.GetGroupByPrim(entity.LocalId).AbsolutePosition;
entityPos = ((SceneObjectPart)entity).ParentGroup.AbsolutePosition;
}
else else
{
entityPos = entity.AbsolutePosition; entityPos = entity.AbsolutePosition;
}
if (!presence.IsChildAgent) if (!presence.IsChildAgent)
{ {