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

Implements osForceSit(string avatar) & overload osForceSit(string avatar, string target) 

Allows a script IN the target prim to force an avatar to sit on it using normal methods as if called by the client.

Overload method of osForceSit() to allow a script NOT in the target prim to force an avatar to sit on the target prim using normal methods as if called by the client.

This patch is based on previous work from
http://opensimulator.org/mantis/view.php?id=4492
and also includes the suggestions from justincc including change of threat level
Thank you Christos Lightling.
mb-throttle-test
Vegaslon 2014-10-09 09:46:17 -04:00 committed by Justin Clark-Casey (justincc)
parent 5db3f08871
commit 79a4d1ea8d
3 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -872,6 +872,59 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
TeleportAgent(m_host.OwnerID.ToString(), regionX, regionY, position, lookat, true);
}
///<summary>
/// Allows a script IN the target prim to force an avatar to sit on it using normal methods
/// as if called by the client.
/// Silent fail if agent (or target if overloaded) not found.
/// Does work if passed key (or keys if overloaded).
/// </summary>
/// <param name="avatar"></param>
public void osForceSit(string avatar)
{
CheckThreatLevel(ThreatLevel.VeryHigh, "osForceSit");
m_host.AddScriptLPS(1);
ForceSit(avatar, m_host.UUID);
}
/// <summary>
/// Overload method of osForceSit(string avatar) to allow a script NOT in the target prim to force
/// an avatar to sit on the target prim using normal methods as if called by the client.
/// </summary>
/// <param name="avatar"></param>
/// <param name="target"></param>
public void osForceSit(string avatar, string target)
{
CheckThreatLevel(ThreatLevel.VeryHigh, "osForceSit");
m_host.AddScriptLPS(1);
UUID targetID = new UUID(target);
ForceSit(avatar, targetID);
}
public void ForceSit(string avatar, UUID targetID)
{
UUID agentID;
if (!UUID.TryParse(avatar, out agentID))
return;
ScenePresence presence = World.GetScenePresence(agentID);
SceneObjectPart part = World.GetSceneObjectPart(targetID);
if (presence != null &&
part != null &&
part.SitTargetAvatar == UUID.Zero)
presence.HandleAgentRequestSit(presence.ControllingClient,
agentID,
targetID,
part.SitTargetPosition);
}
// Functions that get information from the agent itself.
//

2
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@ -363,6 +363,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Float osGetHealth(string avatar);
void osCauseHealing(string avatar, double healing);
void osCauseDamage(string avatar, double damage);
void osForceSit(string avatar);
void osForceSit(string avatar, string target);
LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules);
void osSetPrimitiveParams(LSL_Key prim, LSL_List rules);
void osSetProjectionParams(bool projection, LSL_Key texture, double fov, double focus, double amb);

9
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@ -920,6 +920,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osCauseHealing(avatar, healing);
}
public void osForceSit(string avatar)
{
m_OSSL_Functions.osForceSit(avatar);
}
public void osForceSit(string avatar, string target)
{
m_OSSL_Functions.osForceSit(avatar, target);
}
public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules)
{
return m_OSSL_Functions.osGetPrimitiveParams(prim, rules);