diff options
author | Diva Canto | 2010-07-08 16:07:37 -0700 |
---|---|---|
committer | Diva Canto | 2010-07-08 16:07:37 -0700 |
commit | 9316e0b867275ff03b3ef0268703294e76149b43 (patch) | |
tree | 9b89628924d7ef49b092884d74a2f0f41c5db516 /OpenSim/Region | |
parent | llVecNorm() now returns a zero-length vector when one is supplied as input. A... (diff) | |
download | opensim-SC_OLD-9316e0b867275ff03b3ef0268703294e76149b43.zip opensim-SC_OLD-9316e0b867275ff03b3ef0268703294e76149b43.tar.gz opensim-SC_OLD-9316e0b867275ff03b3ef0268703294e76149b43.tar.bz2 opensim-SC_OLD-9316e0b867275ff03b3ef0268703294e76149b43.tar.xz |
These 2 files want to be committed.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 5941abd..c5226ba 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -450,7 +450,7 @@ 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 | return LSL_Vector.Norm(v); | 454 | return LSL_Vector.Norm(v); |
455 | } | 455 | } |
456 | 456 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index bb5267c..91e03ac 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
@@ -259,15 +259,15 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
259 | return Math.Sqrt(v.x * v.x + v.y * v.y + v.z * v.z); | 259 | return Math.Sqrt(v.x * v.x + v.y * v.y + v.z * v.z); |
260 | } | 260 | } |
261 | 261 | ||
262 | public static Vector3 Norm(Vector3 vector) | 262 | public static Vector3 Norm(Vector3 vector) |
263 | { | 263 | { |
264 | double mag = Mag(vector); | 264 | double mag = Mag(vector); |
265 | if (mag > 0.0) | 265 | if (mag > 0.0) |
266 | { | 266 | { |
267 | double invMag = 1.0 / mag; | 267 | double invMag = 1.0 / mag; |
268 | return vector * invMag; | 268 | return vector * invMag; |
269 | } | 269 | } |
270 | return new Vector3(0, 0, 0); | 270 | return new Vector3(0, 0, 0); |
271 | } | 271 | } |
272 | 272 | ||
273 | #endregion | 273 | #endregion |