aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs20
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs8
2 files changed, 9 insertions, 19 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 688354c..e2909ff 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -753,14 +753,20 @@ namespace OpenSim.Region.ScriptEngine.Common
753 return new LSL_Types.Vector3(0, 0, 0); 753 return new LSL_Types.Vector3(0, 0, 0);
754 754
755 return new LSL_Types.Vector3(SensedObject.Velocity.X, SensedObject.Velocity.Y, SensedObject.Velocity.Z); 755 return new LSL_Types.Vector3(SensedObject.Velocity.X, SensedObject.Velocity.Y, SensedObject.Velocity.Z);
756 // return new LSL_Types.Vector3();
757 } 756 }
758 757
759 public LSL_Types.Vector3 llDetectedGrab(int number) 758 public LSL_Types.Vector3 llDetectedGrab(int number)
760 { 759 {
761 m_host.AddScriptLPS(1); 760 m_host.AddScriptLPS(1);
762 NotImplemented("llDetectedGrab"); 761 EntityBase SensedObject = entityDetectedKey(number);
763 return new LSL_Types.Vector3(); 762 if (SensedObject == null)
763 return new LSL_Types.Vector3(0, 0, 0);
764
765 return new LSL_Types.Vector3(
766 SensedObject.AbsolutePosition.X,
767 SensedObject.AbsolutePosition.Y,
768 SensedObject.AbsolutePosition.Y );
769
764 } 770 }
765 771
766 public LSL_Types.Quaternion llDetectedRot(int number) 772 public LSL_Types.Quaternion llDetectedRot(int number)
@@ -3036,7 +3042,6 @@ namespace OpenSim.Region.ScriptEngine.Common
3036 z = axis.z * t; 3042 z = axis.z * t;
3037 3043
3038 return new LSL_Types.Quaternion(x,y,z,s); 3044 return new LSL_Types.Quaternion(x,y,z,s);
3039 // NotImplemented("llAxisAngle2Rot");
3040 } 3045 }
3041 3046
3042 3047
@@ -3123,7 +3128,6 @@ namespace OpenSim.Region.ScriptEngine.Common
3123 m_host.AddScriptLPS(1); 3128 m_host.AddScriptLPS(1);
3124 3129
3125 return (double) Math.Acos(a.x * b.x + a.y * b.y + a.z * b.z + a.s * b.s) * 2; 3130 return (double) Math.Acos(a.x * b.x + a.y * b.y + a.z * b.z + a.s * b.s) * 2;
3126// NotImplemented("llAngleBetween");
3127 } 3131 }
3128 3132
3129 public string llGetInventoryKey(string name) 3133 public string llGetInventoryKey(string name)
@@ -4400,12 +4404,6 @@ namespace OpenSim.Region.ScriptEngine.Common
4400 { 4404 {
4401 m_host.AddScriptLPS(1); 4405 m_host.AddScriptLPS(1);
4402 return m_host.GetAvatarOnSitTarget().ToString(); 4406 return m_host.GetAvatarOnSitTarget().ToString();
4403 //LLUUID AVID = m_host.GetAvatarOnSitTarget();
4404
4405 //if (AVID != LLUUID.Zero)
4406 // return AVID.ToString();
4407 //else
4408 // return String.Empty;
4409 } 4407 }
4410 4408
4411 public void llAddToLandPassList(string avatar, double hours) 4409 public void llAddToLandPassList(string avatar, double hours)
diff --git a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
index d901c21..9c660c1 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
@@ -2978,7 +2978,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
2978 z = axis.z * t; 2978 z = axis.z * t;
2979 2979
2980 return new LSL_Types.Quaternion(x,y,z,s); 2980 return new LSL_Types.Quaternion(x,y,z,s);
2981 // NotImplemented("llAxisAngle2Rot");
2982 } 2981 }
2983 2982
2984 2983
@@ -3065,7 +3064,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
3065 m_host.AddScriptLPS(1); 3064 m_host.AddScriptLPS(1);
3066 3065
3067 return (double) Math.Acos(a.x * b.x + a.y * b.y + a.z * b.z + a.s * b.s) * 2; 3066 return (double) Math.Acos(a.x * b.x + a.y * b.y + a.z * b.z + a.s * b.s) * 2;
3068// NotImplemented("llAngleBetween");
3069 } 3067 }
3070 3068
3071 public string llGetInventoryKey(string name) 3069 public string llGetInventoryKey(string name)
@@ -4266,12 +4264,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
4266 { 4264 {
4267 m_host.AddScriptLPS(1); 4265 m_host.AddScriptLPS(1);
4268 return m_host.GetAvatarOnSitTarget().ToString(); 4266 return m_host.GetAvatarOnSitTarget().ToString();
4269 //LLUUID AVID = m_host.GetAvatarOnSitTarget();
4270
4271 //if (AVID != LLUUID.Zero)
4272 // return AVID.ToString();
4273 //else
4274 // return String.Empty;
4275 } 4267 }
4276 4268
4277 public void llAddToLandPassList(string avatar, double hours) 4269 public void llAddToLandPassList(string avatar, double hours)