Second Life viewer sources 1.14.0.0

1 files changed, 19 insertions, 24 deletions

diff --git a/linden/indra/llmath/v3math.h b/linden/indra/llmath/v3math.h
index 68e60de..e7134eb 100644
--- a/linden/indra/llmath/v3math.h
+++ b/linden/indra/llmath/v3math.h
@@ -37,7 +37,7 @@ class LLMatrix3;
 class LLVector3d;
 class LLQuaternion;
 
-//  Llvector3 = |x y z w|
+//  LLvector3 = |x y z w|
 
 static const U32 LENGTHOFVECTOR3 = 3;
 
@@ -60,32 +60,13 @@ class LLVector3
                 inline explicit LLVector3(const F32 *vec);                              // Initializes LLVector3 to (vec[0]. vec[1], vec[2])
                 explicit LLVector3(const LLVector3d &vec);                              // Initializes LLVector3 to (vec[0]. vec[1], vec[2])
                 explicit LLVector3(const LLVector4 &vec);                               // Initializes LLVector4 to (vec[0]. vec[1], vec[2])
-                LLVector3(const LLSD& sd)
-                {
-                        setValue(sd);
-                }
+                LLVector3(const LLSD& sd);
 
-                LLSD getValue() const
-                {
-                        LLSD ret;
-                        ret[0] = mV[0];
-                        ret[1] = mV[1];
-                        ret[2] = mV[2];
-                        return ret;
-                }
+                LLSD getValue() const;
 
-                void setValue(const LLSD& sd)
-                {
-                        mV[0] = (F32) sd[0].asReal();
-                        mV[1] = (F32) sd[1].asReal();
-                        mV[2] = (F32) sd[2].asReal();
-                }
+                void setValue(const LLSD& sd);
 
-                const LLVector3& operator=(const LLSD& sd)
-                {
-                        setValue(sd);
-                        return *this;
-                }
+                const LLVector3& operator=(const LLSD& sd);
 
                 inline BOOL isFinite() const;                                                                   // checks to see if all values of LLVector3 are finite
                 BOOL            clamp(F32 min, F32 max);                // Clamps all values to (min,max), returns TRUE if data changed
@@ -434,6 +415,20 @@ inline BOOL	LLVector3::isNull() const
         return FALSE;
 }
 
+inline void update_min_max(LLVector3& min, LLVector3& max, const LLVector3& pos)
+{
+        for (U32 i = 0; i < 3; i++)
+        {
+                if (min.mV[i] > pos.mV[i])
+                {
+                        min.mV[i] = pos.mV[i];
+                }
+                if (max.mV[i] < pos.mV[i])
+                {
+                        max.mV[i] = pos.mV[i];
+                }
+        }
+}
 
 inline F32 angle_between(const LLVector3& a, const LLVector3& b)
 {