Merge branch 'master' into careminster-presence-refactor

2 files changed, 11 insertions, 11 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index b335ae6..f996ff4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -518,13 +518,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Vector llVecNorm(LSL_Vector v)
         {
-            m_host.AddScriptLPS(1);
-            double mag = LSL_Vector.Mag(v);
-            LSL_Vector nor = new LSL_Vector();
-            nor.x = v.x / mag;
-            nor.y = v.y / mag;
-            nor.z = v.z / mag;
-            return nor;
+            m_host.AddScriptLPS(1);

+            return LSL_Vector.Norm(v);
         }
 
         public LSL_Float llVecDist(LSL_Vector a, LSL_Vector b)
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 5927973..01141ee 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
                 return Math.Sqrt(v.x * v.x + v.y * v.y + v.z * v.z);
             }
 
-            public static Vector3 Norm(Vector3 vector)
-            {
-                double mag = Mag(vector);
-                return new Vector3(vector.x / mag, vector.y / mag, vector.z / mag);
+            public static Vector3 Norm(Vector3 vector)

+            {

+                double mag = Mag(vector);

+                if (mag > 0.0)

+                {

+                    double invMag = 1.0 / mag;

+                    return vector * invMag;

+                }

+                return new Vector3(0, 0, 0);

             }
 
             #endregion