aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-10-11 00:14:35 +0100
committerJustin Clark-Casey (justincc)2014-10-11 00:14:35 +0100
commit00b23e51aecab7902f0fe0a0b138698ad28caea2 (patch)
treed66910dfbc4d2d809a7e869f5627b4458a7398a7 /OpenSim
parentminor: spacing cleanup from previous commit 79a4d1ea (diff)
downloadopensim-SC_OLD-00b23e51aecab7902f0fe0a0b138698ad28caea2.zip
opensim-SC_OLD-00b23e51aecab7902f0fe0a0b138698ad28caea2.tar.gz
opensim-SC_OLD-00b23e51aecab7902f0fe0a0b138698ad28caea2.tar.bz2
opensim-SC_OLD-00b23e51aecab7902f0fe0a0b138698ad28caea2.tar.xz
Change name of just added OSSL osForceSit() to osForceOtherSit()
This is somewhat more in keeping with something like osForceAttachToOtherAvatarFromInventory() and potentially allows a separate osForceSit() command with High threat rather than VeryHigh that only sits the owner and can be enabled without enabling sit of other avatars.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs9
3 files changed, 12 insertions, 11 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 60ab75e..704ff15 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
880 /// Does work if passed key (or keys if overloaded). 880 /// Does work if passed key (or keys if overloaded).
881 /// </summary> 881 /// </summary>
882 /// <param name="avatar"></param> 882 /// <param name="avatar"></param>
883 public void osForceSit(string avatar) 883 public void osForceOtherSit(string avatar)
884 { 884 {
885 CheckThreatLevel(ThreatLevel.VeryHigh, "osForceSit"); 885 CheckThreatLevel(ThreatLevel.VeryHigh, "osForceOtherSit");
886 886
887 m_host.AddScriptLPS(1); 887 m_host.AddScriptLPS(1);
888 888
@@ -890,14 +890,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
890 } 890 }
891 891
892 /// <summary> 892 /// <summary>
893 /// Overload method of osForceSit(string avatar) to allow a script NOT in the target prim to force 893 /// Overload method of osForceOtherSit(string avatar) to allow a script NOT in the target prim to force
894 /// an avatar to sit on the target prim using normal methods as if called by the client. 894 /// an avatar to sit on the target prim using normal methods as if called by the client.
895 /// </summary> 895 /// </summary>
896 /// <param name="avatar"></param> 896 /// <param name="avatar"></param>
897 /// <param name="target"></param> 897 /// <param name="target"></param>
898 public void osForceSit(string avatar, string target) 898 public void osForceOtherSit(string avatar, string target)
899 { 899 {
900 CheckThreatLevel(ThreatLevel.VeryHigh, "osForceSit"); 900 CheckThreatLevel(ThreatLevel.VeryHigh, "osForceOtherSit");
901 901
902 m_host.AddScriptLPS(1); 902 m_host.AddScriptLPS(1);
903 903
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 83a0808..38d4574 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
363 LSL_Float osGetHealth(string avatar); 363 LSL_Float osGetHealth(string avatar);
364 void osCauseHealing(string avatar, double healing); 364 void osCauseHealing(string avatar, double healing);
365 void osCauseDamage(string avatar, double damage); 365 void osCauseDamage(string avatar, double damage);
366 void osForceSit(string avatar); 366 void osForceOtherSit(string avatar);
367 void osForceSit(string avatar, string target); 367 void osForceOtherSit(string avatar, string target);
368 LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules); 368 LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules);
369 void osSetPrimitiveParams(LSL_Key prim, LSL_List rules); 369 void osSetPrimitiveParams(LSL_Key prim, LSL_List rules);
370 void osSetProjectionParams(bool projection, LSL_Key texture, double fov, double focus, double amb); 370 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 da88cc4..352a35d 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
920 m_OSSL_Functions.osCauseHealing(avatar, healing); 920 m_OSSL_Functions.osCauseHealing(avatar, healing);
921 } 921 }
922 922
923 public void osForceSit(string avatar) 923 public void osForceOtherSit(string avatar)
924 { 924 {
925 m_OSSL_Functions.osForceSit(avatar); 925 m_OSSL_Functions.osForceOtherSit(avatar);
926 } 926 }
927 public void osForceSit(string avatar, string target) 927
928 public void osForceOtherSit(string avatar, string target)
928 { 929 {
929 m_OSSL_Functions.osForceSit(avatar, target); 930 m_OSSL_Functions.osForceOtherSit(avatar, target);
930 } 931 }
931 932
932 public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules) 933 public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules)