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

Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmerge

avinationmerge
Melanie 2011-10-12 01:39:38 +01:00
parent 2c03b6f0ae 3142982353
commit c0555f6be6
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
View File

@ -302,37 +302,20 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
return string.Empty; return string.Empty;
} }
/// <summary> /// <summary>
/// Find the scene for an agent /// Find the root client for a ID
/// </summary> /// </summary>
private Scene GetClientScene(UUID agentId) public IClientAPI LocateClientObject(UUID agentID)
{ {
lock (m_Scenes) lock (m_Scenes)
{ {
foreach (Scene scene in m_Scenes) foreach (Scene scene in m_Scenes)
{
ScenePresence presence = scene.GetScenePresence(agentId);
if (presence != null && !presence.IsChildAgent)
return scene;
}
}
return null;
}
/// <summary>
/// Find the client for a ID
/// </summary>
public IClientAPI LocateClientObject(UUID agentID)
{
Scene scene = GetClientScene(agentID);
if (scene != null)
{ {
ScenePresence presence = scene.GetScenePresence(agentID); ScenePresence presence = scene.GetScenePresence(agentID);
if (presence != null) if (presence != null && !presence.IsChildAgent)
return presence.ControllingClient; return presence.ControllingClient;
} }
}
return null; return null;
} }