diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 60ab75e412..704ff15037 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -880,9 +880,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// Does work if passed key (or keys if overloaded).
///
///
- public void osForceSit(string avatar)
+ public void osForceOtherSit(string avatar)
{
- CheckThreatLevel(ThreatLevel.VeryHigh, "osForceSit");
+ CheckThreatLevel(ThreatLevel.VeryHigh, "osForceOtherSit");
m_host.AddScriptLPS(1);
@@ -890,14 +890,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
///
- /// Overload method of osForceSit(string avatar) to allow a script NOT in the target prim to force
+ /// Overload method of osForceOtherSit(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.
///
///
///
- public void osForceSit(string avatar, string target)
+ public void osForceOtherSit(string avatar, string target)
{
- CheckThreatLevel(ThreatLevel.VeryHigh, "osForceSit");
+ CheckThreatLevel(ThreatLevel.VeryHigh, "osForceOtherSit");
m_host.AddScriptLPS(1);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 83a0808b4c..38d4574be2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -363,8 +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);
+ void osForceOtherSit(string avatar);
+ void osForceOtherSit(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);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index da88cc499e..352a35da6f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -920,13 +920,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osCauseHealing(avatar, healing);
}
- public void osForceSit(string avatar)
+ public void osForceOtherSit(string avatar)
{
- m_OSSL_Functions.osForceSit(avatar);
+ m_OSSL_Functions.osForceOtherSit(avatar);
}
- public void osForceSit(string avatar, string target)
+
+ public void osForceOtherSit(string avatar, string target)
{
- m_OSSL_Functions.osForceSit(avatar, target);
+ m_OSSL_Functions.osForceOtherSit(avatar, target);
}
public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules)