Removed use of 'is' operator and casting to find the root ScenePresence in MessageTransfer modules and Groups module.

This commit is contained in:
Dan Lake
2011-10-27 02:26:37 -07:00
parent 06577d7299
commit 272bf71279
4 changed files with 52 additions and 81 deletions

View File

@@ -1076,17 +1076,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// Try root avatar first
foreach (Scene scene in m_sceneList)
{
if (scene.Entities.ContainsKey(agentID) &&
scene.Entities[agentID] is ScenePresence)
ScenePresence sp = scene.GetScenePresence(agentID);
if (sp != null)
{
ScenePresence user = (ScenePresence)scene.Entities[agentID];
if (!user.IsChildAgent)
if (!sp.IsChildAgent)
{
return user.ControllingClient;
return sp.ControllingClient;
}
else
{
child = user.ControllingClient;
child = sp.ControllingClient;
}
}
}