aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
diff options
context:
space:
mode:
authorMelanie2010-07-11 13:32:10 +0100
committerMelanie2010-07-11 13:32:10 +0100
commit922e874653e81ae9b72da210ecfe1d2eb5efa9c6 (patch)
tree25ac2c896c952ca7298cecb700b61f7301439216 /OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
parentFix the synchronousrestformsrequester so it will successfully handle a respon... (diff)
parentRemove localID from script controls data. It won't transfer to another (diff)
downloadopensim-SC_OLD-922e874653e81ae9b72da210ecfe1d2eb5efa9c6.zip
opensim-SC_OLD-922e874653e81ae9b72da210ecfe1d2eb5efa9c6.tar.gz
opensim-SC_OLD-922e874653e81ae9b72da210ecfe1d2eb5efa9c6.tar.bz2
opensim-SC_OLD-922e874653e81ae9b72da210ecfe1d2eb5efa9c6.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 01141ee..c9049e2 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