diff options
| author | Melanie | 2010-07-17 03:09:27 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-17 03:09:27 +0100 |
| commit | 6f591376dd22c05d297dec6e5fe0d78e47a7d0ff (patch) | |
| tree | 52ba1d530eef192274471b212afe1fdec7715cb8 /OpenSim/Region/ScriptEngine/Shared/Api | |
| parent | Merge branch '0.6.9-post-fixes' into careminster (diff) | |
| parent | Stop occasional permanently high 100% utilization when the server is started ... (diff) | |
| download | opensim-SC-6f591376dd22c05d297dec6e5fe0d78e47a7d0ff.zip opensim-SC-6f591376dd22c05d297dec6e5fe0d78e47a7d0ff.tar.gz opensim-SC-6f591376dd22c05d297dec6e5fe0d78e47a7d0ff.tar.bz2 opensim-SC-6f591376dd22c05d297dec6e5fe0d78e47a7d0ff.tar.xz | |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to '')
| -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 ec7fde0..012ba90 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -467,13 +467,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 467 | 467 | ||
| 468 | public LSL_Vector llVecNorm(LSL_Vector v) | 468 | public LSL_Vector llVecNorm(LSL_Vector v) |
| 469 | { | 469 | { |
| 470 | m_host.AddScriptLPS(1); | 470 | m_host.AddScriptLPS(1); |
| 471 | double mag = LSL_Vector.Mag(v); | 471 | return LSL_Vector.Norm(v); |
| 472 | LSL_Vector nor = new LSL_Vector(); | ||
| 473 | nor.x = v.x / mag; | ||
| 474 | nor.y = v.y / mag; | ||
| 475 | nor.z = v.z / mag; | ||
| 476 | return nor; | ||
| 477 | } | 472 | } |
| 478 | 473 | ||
| 479 | public LSL_Float llVecDist(LSL_Vector a, LSL_Vector b) | 474 | public LSL_Float llVecDist(LSL_Vector a, LSL_Vector b) |