aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPixel Tomsen2011-09-26 20:18:06 +0200
committerJustin Clark-Casey (justincc)2011-09-29 01:08:05 +0100
commit528fcede6c31c056c3863fd19528558fcbaf475f (patch)
tree6c9e7787f84df713df95df950c3d1e09d2402863
parentAdd en_US culture setting to the async delete to inventory thread, to avoid a... (diff)
downloadopensim-SC_OLD-528fcede6c31c056c3863fd19528558fcbaf475f.zip
opensim-SC_OLD-528fcede6c31c056c3863fd19528558fcbaf475f.tar.gz
opensim-SC_OLD-528fcede6c31c056c3863fd19528558fcbaf475f.tar.bz2
opensim-SC_OLD-528fcede6c31c056c3863fd19528558fcbaf475f.tar.xz
llAvatarOnLinkSitTarget Implementation
http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs14
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs5
3 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 070cdc0..39da563 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6296,6 +6296,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6296 return m_host.GetAvatarOnSitTarget().ToString(); 6296 return m_host.GetAvatarOnSitTarget().ToString();
6297 } 6297 }
6298 6298
6299 // http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget
6300 public LSL_String llAvatarOnLinkSitTarget(int linknum)
6301 {
6302 m_host.AddScriptLPS(1);
6303 if(linknum == ScriptBaseClass.LINK_SET ||
6304 linknum == ScriptBaseClass.LINK_ALL_CHILDREN ||
6305 linknum == ScriptBaseClass.LINK_ALL_OTHERS) return UUID.Zero.ToString();
6306
6307 List<SceneObjectPart> parts = GetLinkParts(linknum);
6308 if (parts.Count == 0) return UUID.Zero.ToString();
6309 return parts[0].SitTargetAvatar.ToString();
6310 }
6311
6312
6299 public void llAddToLandPassList(string avatar, double hours) 6313 public void llAddToLandPassList(string avatar, double hours)
6300 { 6314 {
6301 m_host.AddScriptLPS(1); 6315 m_host.AddScriptLPS(1);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 4d7d60d..62e2854 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -54,6 +54,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
54 LSL_Float llAtan2(double x, double y); 54 LSL_Float llAtan2(double x, double y);
55 void llAttachToAvatar(int attachment); 55 void llAttachToAvatar(int attachment);
56 LSL_Key llAvatarOnSitTarget(); 56 LSL_Key llAvatarOnSitTarget();
57 LSL_Key llAvatarOnLinkSitTarget(int linknum);
57 LSL_Rotation llAxes2Rot(LSL_Vector fwd, LSL_Vector left, LSL_Vector up); 58 LSL_Rotation llAxes2Rot(LSL_Vector fwd, LSL_Vector left, LSL_Vector up);
58 LSL_Rotation llAxisAngle2Rot(LSL_Vector axis, double angle); 59 LSL_Rotation llAxisAngle2Rot(LSL_Vector axis, double angle);
59 LSL_Integer llBase64ToInteger(string str); 60 LSL_Integer llBase64ToInteger(string str);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 96e46fd..508f33b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -129,6 +129,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
129 return m_LSL_Functions.llAvatarOnSitTarget(); 129 return m_LSL_Functions.llAvatarOnSitTarget();
130 } 130 }
131 131
132 public LSL_Key llAvatarOnLinkSitTarget(int linknum)
133 {
134 return m_LSL_Functions.llAvatarOnLinkSitTarget(linknum);
135 }
136
132 public LSL_Rotation llAxes2Rot(LSL_Vector fwd, LSL_Vector left, LSL_Vector up) 137 public LSL_Rotation llAxes2Rot(LSL_Vector fwd, LSL_Vector left, LSL_Vector up)
133 { 138 {
134 return m_LSL_Functions.llAxes2Rot(fwd, left, up); 139 return m_LSL_Functions.llAxes2Rot(fwd, left, up);