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

Implement XMLRPCAdmin command admin_teleport_agent.

Browse Source 
This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position.
This commit is contained in:
Justin Clark-Casey (justincc)
2011-12-07 17:31:57 +00:00
parent a8ed185c00
commit 415b7b7ec4
5 changed files with 157 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4206,7 +4206,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="action"></param>
public void ForEachRootScenePresence(Action<ScenePresence> action)
{
if(m_sceneGraph != null)
if (m_sceneGraph != null)
{
m_sceneGraph.ForEachAvatar(action);
}
@@ -4286,9 +4286,9 @@ namespace OpenSim.Region.Framework.Scenes
return m_sceneGraph.GetGroupByPrim(localID);
}
public override bool TryGetScenePresence(UUID avatarId, out ScenePresence avatar)
public override bool TryGetScenePresence(UUID agentID, out ScenePresence sp)
{
return m_sceneGraph.TryGetScenePresence(avatarId, out avatar);
return m_sceneGraph.TryGetScenePresence(agentID, out sp);
}
public bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)

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

@@ -191,6 +191,12 @@ namespace OpenSim.Region.Framework.Scenes
return false;
}
/// <summary>
/// Try to get a scene presence from the scene
/// </summary>
/// <param name="agentID"></param>
/// <param name="scenePresence">null if there is no scene presence with the given agent id</param>
/// <returns>true if there was a scene presence with the given id, false otherwise.</returns>
public abstract bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence);
#endregion

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

@@ -545,6 +545,23 @@ namespace OpenSim.Region.Framework.Scenes
return false;
}
public bool TryGetRootScenePresence(UUID avatarId, out ScenePresence avatar)
{
lock (m_localScenes)
{
foreach (Scene scene in m_localScenes)
{
avatar = scene.GetScenePresence(avatarId);
if (avatar != null && !avatar.IsChildAgent)
return true;
}
}
avatar = null;
return false;
}
public bool TryGetAvatarsScene(UUID avatarId, out Scene scene)
{
ScenePresence avatar = null;
@@ -590,6 +607,22 @@ namespace OpenSim.Region.Framework.Scenes
return false;
}
public bool TryGetRootScenePresenceByName(string firstName, string lastName, out ScenePresence sp)
{
lock (m_localScenes)
{
foreach (Scene scene in m_localScenes)
{
sp = scene.GetScenePresence(firstName, lastName);
if (sp != null && !sp.IsChildAgent)
return true;
}
}
sp = null;
return false;
}
public void ForEachScene(Action<Scene> action)
{
lock (m_localScenes)