aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
diff options
context:
space:
mode:
authorMelanie2010-07-08 17:32:57 +0100
committerMelanie2010-07-08 17:32:57 +0100
commit5f400a50beb2b9d523e5a0fac643ca1cb247c9a6 (patch)
treeda874e34ef1c790f9b8ce9dc0533ac98755d783c /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
parentminimizes temp garbage for llParseStringKeepNulls() (diff)
parentllVecNorm() now returns a zero-length vector when one is supplied as input. A... (diff)
downloadopensim-SC-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.zip
opensim-SC-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.gz
opensim-SC-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.bz2
opensim-SC-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs9
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index b335ae6..f996ff4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -518,13 +518,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
518 518
519 public LSL_Vector llVecNorm(LSL_Vector v) 519 public LSL_Vector llVecNorm(LSL_Vector v)
520 { 520 {
521 m_host.AddScriptLPS(1); 521 m_host.AddScriptLPS(1);
522 double mag = LSL_Vector.Mag(v); 522 return LSL_Vector.Norm(v);
523 LSL_Vector nor = new LSL_Vector();
524 nor.x = v.x / mag;
525 nor.y = v.y / mag;
526 nor.z = v.z / mag;
527 return nor;
528 } 523 }
529 524
530 public LSL_Float llVecDist(LSL_Vector a, LSL_Vector b) 525 public LSL_Float llVecDist(LSL_Vector a, LSL_Vector b)