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

A little minor cleanup and harmonizing between LSL_BuiltIn_Commands.cs 

and its copy LSL_ScriptCommands.cs
0.6.0-stable
Charles Krinke 2008-06-13 01:54:53 +00:00
parent 64f01ade04
commit 3b4c2c1ff1
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -753,14 +753,20 @@ namespace OpenSim.Region.ScriptEngine.Common
return new LSL_Types.Vector3(0, 0, 0); return new LSL_Types.Vector3(0, 0, 0);
return new LSL_Types.Vector3(SensedObject.Velocity.X, SensedObject.Velocity.Y, SensedObject.Velocity.Z); return new LSL_Types.Vector3(SensedObject.Velocity.X, SensedObject.Velocity.Y, SensedObject.Velocity.Z);
// return new LSL_Types.Vector3();
} }
public LSL_Types.Vector3 llDetectedGrab(int number) public LSL_Types.Vector3 llDetectedGrab(int number)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
NotImplemented("llDetectedGrab"); EntityBase SensedObject = entityDetectedKey(number);
return new LSL_Types.Vector3(); if (SensedObject == null)
return new LSL_Types.Vector3(0, 0, 0);
return new LSL_Types.Vector3(
SensedObject.AbsolutePosition.X,
SensedObject.AbsolutePosition.Y,
SensedObject.AbsolutePosition.Y );
} }
public LSL_Types.Quaternion llDetectedRot(int number) public LSL_Types.Quaternion llDetectedRot(int number)
@ -3036,7 +3042,6 @@ namespace OpenSim.Region.ScriptEngine.Common
z = axis.z * t; z = axis.z * t;
return new LSL_Types.Quaternion(x,y,z,s); return new LSL_Types.Quaternion(x,y,z,s);
// NotImplemented("llAxisAngle2Rot");
} }
@ -3123,7 +3128,6 @@ namespace OpenSim.Region.ScriptEngine.Common
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
return (double) Math.Acos(a.x * b.x + a.y * b.y + a.z * b.z + a.s * b.s) * 2; return (double) Math.Acos(a.x * b.x + a.y * b.y + a.z * b.z + a.s * b.s) * 2;
// NotImplemented("llAngleBetween");
} }
public string llGetInventoryKey(string name) public string llGetInventoryKey(string name)
@ -4400,12 +4404,6 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
return m_host.GetAvatarOnSitTarget().ToString(); return m_host.GetAvatarOnSitTarget().ToString();
//LLUUID AVID = m_host.GetAvatarOnSitTarget();
//if (AVID != LLUUID.Zero)
// return AVID.ToString();
//else
// return String.Empty;
} }
public void llAddToLandPassList(string avatar, double hours) public void llAddToLandPassList(string avatar, double hours)

8
OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
View File

@ -2978,7 +2978,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
z = axis.z * t; z = axis.z * t;
return new LSL_Types.Quaternion(x,y,z,s); return new LSL_Types.Quaternion(x,y,z,s);
// NotImplemented("llAxisAngle2Rot");
} }
@ -3065,7 +3064,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
return (double) Math.Acos(a.x * b.x + a.y * b.y + a.z * b.z + a.s * b.s) * 2; return (double) Math.Acos(a.x * b.x + a.y * b.y + a.z * b.z + a.s * b.s) * 2;
// NotImplemented("llAngleBetween");
} }
public string llGetInventoryKey(string name) public string llGetInventoryKey(string name)
@ -4266,12 +4264,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
return m_host.GetAvatarOnSitTarget().ToString(); return m_host.GetAvatarOnSitTarget().ToString();
//LLUUID AVID = m_host.GetAvatarOnSitTarget();
//if (AVID != LLUUID.Zero)
// return AVID.ToString();
//else
// return String.Empty;
} }
public void llAddToLandPassList(string avatar, double hours) public void llAddToLandPassList(string avatar, double hours)