diff options
| author | Justin Clark-Casey (justincc) | 2010-07-13 23:36:56 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-07-13 23:36:56 +0100 |
| commit | b2ef5658b1ab7b60b696d52a2d92edeeca12be07 (patch) | |
| tree | 6431ebb9293f027891afcc84e2895a8ec635e0f5 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
| parent | replace o with ; in oXmlRpcPort in OpenSim.ini.example (diff) | |
| parent | llVecNorm() now returns a zero-length vector when one is supplied as input. A... (diff) | |
| download | opensim-SC_OLD-b2ef5658b1ab7b60b696d52a2d92edeeca12be07.zip opensim-SC_OLD-b2ef5658b1ab7b60b696d52a2d92edeeca12be07.tar.gz opensim-SC_OLD-b2ef5658b1ab7b60b696d52a2d92edeeca12be07.tar.bz2 opensim-SC_OLD-b2ef5658b1ab7b60b696d52a2d92edeeca12be07.tar.xz | |
Merge branch '0.6.9-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.6.9-post-fixes
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 9 |
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 e4e087f..eaaa9eb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -450,13 +450,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 450 | 450 | ||
| 451 | public LSL_Vector llVecNorm(LSL_Vector v) | 451 | public LSL_Vector llVecNorm(LSL_Vector v) |
| 452 | { | 452 | { |
| 453 | m_host.AddScriptLPS(1); | 453 | m_host.AddScriptLPS(1); |
| 454 | double mag = LSL_Vector.Mag(v); | 454 | return LSL_Vector.Norm(v); |
| 455 | LSL_Vector nor = new LSL_Vector(); | ||
| 456 | nor.x = v.x / mag; | ||
| 457 | nor.y = v.y / mag; | ||
| 458 | nor.z = v.z / mag; | ||
| 459 | return nor; | ||
| 460 | } | 455 | } |
| 461 | 456 | ||
| 462 | public LSL_Float llVecDist(LSL_Vector a, LSL_Vector b) | 457 | public LSL_Float llVecDist(LSL_Vector a, LSL_Vector b) |