Second Life viewer sources 1.14.0.0

1 files changed, 29 insertions, 2 deletions

diff --git a/linden/indra/llmath/v3math.cpp b/linden/indra/llmath/v3math.cpp
index 39d3b70..a97b6d8 100644
--- a/linden/indra/llmath/v3math.cpp
+++ b/linden/indra/llmath/v3math.cpp
@@ -137,7 +137,7 @@ const LLVector3&	LLVector3::rotVec(F32 angle, const LLVector3 &vec)
 {
         if ( !vec.isExactlyZero() && angle )
         {
-                *this = *this * LLMatrix3(angle, vec);
+                *this = *this * LLQuaternion(angle, vec);
         }
         return *this;
 }
@@ -147,7 +147,7 @@ const LLVector3&	LLVector3::rotVec(F32 angle, F32 x, F32 y, F32 z)
         LLVector3 vec(x, y, z);
         if ( !vec.isExactlyZero() && angle )
         {
-                *this = *this * LLMatrix3(angle, vec);
+                *this = *this * LLQuaternion(angle, vec);
         }
         return *this;
 }
@@ -198,6 +198,33 @@ LLVector3::LLVector3(const LLVector4 &vec)
         mV[VZ] = (F32)vec.mV[VZ];
 }
 
+LLVector3::LLVector3(const LLSD& sd)
+{
+        setValue(sd);
+}
+
+LLSD LLVector3::getValue() const
+{
+        LLSD ret;
+        ret[0] = mV[0];
+        ret[1] = mV[1];
+        ret[2] = mV[2];
+        return ret;
+}
+
+void LLVector3::setValue(const LLSD& sd)
+{
+        mV[0] = (F32) sd[0].asReal();
+        mV[1] = (F32) sd[1].asReal();
+        mV[2] = (F32) sd[2].asReal();
+}
+
+const LLVector3& LLVector3::operator=(const LLSD& sd)
+{
+        setValue(sd);
+        return *this;
+}
+
 const LLVector3& operator*=(LLVector3 &a, const LLQuaternion &rot)
 {
     const F32 rw = - rot.mQ[VX] * a.mV[VX] - rot.mQ[VY] * a.mV[VY] - rot.mQ[VZ] * a.mV[VZ];