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

Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.

Browse Source
This commit is contained in:
Dan Lake
2010-03-19 05:58:34 -07:00
committed by John Hurliman
parent 859bc717a4
commit 62e0b53ca4
22 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -132,7 +132,7 @@ namespace OpenSim.Region.Framework.Scenes
{
ScenePresence avatar;
if (TryGetAvatar(avatarId, out avatar))
if (TryGetScenePresence(avatarId, out avatar))
{
IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>();
if (invAccess != null)
@@ -230,7 +230,7 @@ namespace OpenSim.Region.Framework.Scenes
{
ScenePresence avatar;
if (TryGetAvatar(avatarId, out avatar))
if (TryGetScenePresence(avatarId, out avatar))
{
return CapsUpdateTaskInventoryScriptAsset(
avatar.ControllingClient, itemId, primId, isScriptRunning, data);
@@ -683,7 +683,7 @@ namespace OpenSim.Region.Framework.Scenes
if (transactionID == UUID.Zero)
{
ScenePresence presence;
if (TryGetAvatar(remoteClient.AgentId, out presence))
if (TryGetScenePresence(remoteClient.AgentId, out presence))
{
byte[] data = null;
@@ -941,7 +941,7 @@ namespace OpenSim.Region.Framework.Scenes
{
ScenePresence avatar;
if (TryGetAvatar(avatarId, out avatar))
if (TryGetScenePresence(avatarId, out avatar))
{
return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId);
}
@@ -1055,7 +1055,7 @@ namespace OpenSim.Region.Framework.Scenes
ScenePresence avatar;
if (TryGetAvatar(srcTaskItem.OwnerID, out avatar))
if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar))
{
destPart.GetProperties(avatar.ControllingClient);
}
@@ -1083,7 +1083,7 @@ namespace OpenSim.Region.Framework.Scenes
}
ScenePresence avatar = null;
if (TryGetAvatar(destID, out avatar))
if (TryGetScenePresence(destID, out avatar))
{
//profile.SendInventoryDecendents(avatar.ControllingClient,
// profile.RootFolder.ID, true, false);
@@ -1420,7 +1420,7 @@ namespace OpenSim.Region.Framework.Scenes
ScenePresence avatar;
if (TryGetAvatar(srcTaskItem.OwnerID, out avatar))
if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar))
{
destPart.GetProperties(avatar.ControllingClient);
}
@@ -1860,7 +1860,7 @@ namespace OpenSim.Region.Framework.Scenes
UUID inventoryID = part.ParentGroup.GetFromItemID();
ScenePresence presence;
if (TryGetAvatar(remoteClient.AgentId, out presence))
if (TryGetScenePresence(remoteClient.AgentId, out presence))
{
if (!Permissions.CanRezObject(part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition))
return;

4
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -4254,9 +4254,9 @@ namespace OpenSim.Region.Framework.Scenes
return m_sceneGraph.GetGroupByPrim(localID);
}
public override bool TryGetAvatar(UUID avatarId, out ScenePresence avatar)
public override bool TryGetScenePresence(UUID avatarId, out ScenePresence avatar)
{
return m_sceneGraph.TryGetAvatar(avatarId, out avatar);
return m_sceneGraph.TryGetScenePresence(avatarId, out avatar);
}
public bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)

6
OpenSim/Region/Framework/Scenes/SceneBase.cs
View File

@@ -190,11 +190,11 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="agentID"></param>
public abstract void RemoveClient(UUID agentID);
public bool TryGetAvatar(UUID agentID, out object scenePresence)
public bool TryGetScenePresence(UUID agentID, out object scenePresence)
{
scenePresence = null;
ScenePresence sp = null;
if (TryGetAvatar(agentID, out sp))
if (TryGetScenePresence(agentID, out sp))
{
scenePresence = sp;
return true;
@@ -203,7 +203,7 @@ namespace OpenSim.Region.Framework.Scenes
return false;
}
public abstract bool TryGetAvatar(UUID agentID, out ScenePresence scenePresence);
public abstract bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence);
#endregion

2
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@@ -756,7 +756,7 @@ namespace OpenSim.Region.Framework.Scenes
return null;
}
protected internal bool TryGetAvatar(UUID agentID, out ScenePresence avatar)
protected internal bool TryGetScenePresence(UUID agentID, out ScenePresence avatar)
{
lock (m_scenePresences)
{

6
OpenSim/Region/Framework/Scenes/SceneManager.cs
View File

@@ -486,11 +486,11 @@ namespace OpenSim.Region.Framework.Scenes
ForEachCurrentScene(delegate(Scene scene) { scene.HandleEditCommand(cmdparams); });
}
public bool TryGetAvatar(UUID avatarId, out ScenePresence avatar)
public bool TryGetScenePresence(UUID avatarId, out ScenePresence avatar)
{
foreach (Scene scene in m_localScenes)
{
if (scene.TryGetAvatar(avatarId, out avatar))
if (scene.TryGetScenePresence(avatarId, out avatar))
{
return true;
}
@@ -505,7 +505,7 @@ namespace OpenSim.Region.Framework.Scenes
ScenePresence avatar = null;
foreach (Scene mScene in m_localScenes)
{
if (mScene.TryGetAvatar(avatarId, out avatar))
if (mScene.TryGetScenePresence(avatarId, out avatar))
{
scene = mScene;
return true;

2
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -680,7 +680,7 @@ namespace OpenSim.Region.Framework.Scenes
if (m_parentGroup != null) // TODO can there be a SOP without a SOG?
{
ScenePresence avatar;
if (m_parentGroup.Scene.TryGetAvatar(m_sitTargetAvatar, out avatar))
if (m_parentGroup.Scene.TryGetScenePresence(m_sitTargetAvatar, out avatar))
{
avatar.ParentPosition = GetWorldPosition();
}

2
OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs
View File

@@ -66,7 +66,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
throw new NotImplementedException();
}
public override bool TryGetAvatar(UUID agentID, out ScenePresence scenePresence)
public override bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence)
{
throw new NotImplementedException();
}