diff options
| author | dahlia | 2010-07-08 10:01:23 -0700 |
|---|---|---|
| committer | dahlia | 2010-07-08 10:01:23 -0700 |
| commit | 815dd73cf3642040b751300c397291b59eedf43d (patch) | |
| tree | 57d9cebe30361b02a3430c5b92f6113ab6e2e735 /OpenSim | |
| parent | Handle a specific exception without spewing red ink. (diff) | |
| download | opensim-SC-815dd73cf3642040b751300c397291b59eedf43d.zip opensim-SC-815dd73cf3642040b751300c397291b59eedf43d.tar.gz opensim-SC-815dd73cf3642040b751300c397291b59eedf43d.tar.bz2 opensim-SC-815dd73cf3642040b751300c397291b59eedf43d.tar.xz | |
fix a potential division by zero
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 941c761..bb5267c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
| @@ -259,10 +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 | return new Vector3(vector.x / mag, vector.y / mag, vector.z / mag); | 265 | if (mag > 0.0) |
| 266 | { | ||
| 267 | double invMag = 1.0 / mag; | ||
| 268 | return vector * invMag; | ||
| 269 | } | ||
| 270 | return new Vector3(0, 0, 0); | ||
| 266 | } | 271 | } |
| 267 | 272 | ||
| 268 | #endregion | 273 | #endregion |