ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Working towards notifying the client if the inventory service has failed, rather than simply returning 0 items.

Browse Source 
* This is very early support which would only be triggered in a rather unlikely case (if the user server correctly received an inventory skeleton, but later on failed to return the whole inventory in a timely manner.  Also, this only applies to the 1.19.1.4 client onwards
* Code cleanup and support for other failure cases (failure of inventory caching on region crossing, failure to actually add a folder/item, etc, should follow.
This commit is contained in:
Justin Clarke Casey
2008-04-14 18:43:23 +00:00
parent e21886eea0
commit b7ae8701ce
5 changed files with 70 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@@ -618,6 +618,28 @@ namespace OpenSim.Region.Environment.Scenes
return result;
}
/// <summary>
/// Get the controlling client for the given avatar, if there is one.
///
/// FIXME: The only user of the method right now is Caps.cs, in order to resolve a client API since it can't
/// use the ScenePresence. This could be better solved in a number of ways - we could establish an
/// OpenSim.Framework.IScenePresence, or move the caps code into a region package (which might be the more
/// suitable solution).
/// </summary>
/// <param name="agentId"></param>
/// <returns>null if either the avatar wasn't in the scene, or they do not have a controlling client</returns>
public IClientAPI GetControllingClient(LLUUID agentId)
{
ScenePresence presence = GetScenePresence(agentId);
if (presence != null)
{
return presence.ControllingClient;
}
return null;
}
/// <summary>
/// Request a filtered list of m_scenePresences in this World
@@ -640,16 +662,17 @@ namespace OpenSim.Region.Environment.Scenes
}
/// <summary>
/// Request a Avatar by UUID
/// Request a scene presence by UUID
/// </summary>
/// <param name="avatarID"></param>
/// <returns></returns>
public ScenePresence GetScenePresence(LLUUID avatarID)
/// <returns>null if the agent was not found</returns>
public ScenePresence GetScenePresence(LLUUID agentID)
{
if (ScenePresences.ContainsKey(avatarID))
if (ScenePresences.ContainsKey(agentID))
{
return ScenePresences[avatarID];
return ScenePresences[agentID];
}
return null;
}