Second Life viewer sources 1.15.0.2

1 files changed, 11 insertions, 1 deletions

diff --git a/linden/indra/llmath/v4math.h b/linden/indra/llmath/v4math.h
index f768ba7..f3c2ccc 100644
--- a/linden/indra/llmath/v4math.h
+++ b/linden/indra/llmath/v4math.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -45,7 +46,8 @@ class LLVector4
         public:
                 F32 mV[LENGTHOFVECTOR4];
                 LLVector4();                                            // Initializes LLVector4 to (0, 0, 0, 1)
-                explicit LLVector4(const F32 *vec);                     // Initializes LLVector4 to (vec[0]. vec[1], vec[2], 1)
+                explicit LLVector4(const F32 *vec);                     // Initializes LLVector4 to (vec[0]. vec[1], vec[2], vec[3])
+                explicit LLVector4(const F64 *vec);                     // Initialized LLVector4 to ((F32) vec[0], (F32) vec[1], (F32) vec[3], (F32) vec[4]);
                 explicit LLVector4(const LLVector3 &vec);                       // Initializes LLVector4 to (vec, 1)
                 explicit LLVector4(const LLVector3 &vec, F32 w);        // Initializes LLVector4 to (vec, w)
                 LLVector4(F32 x, F32 y, F32 z);         // Initializes LLVector4 to (x. y, z, 1)
@@ -155,6 +157,14 @@ inline LLVector4::LLVector4(const F32 *vec)
         mV[VW] = vec[VW];
 }
 
+inline LLVector4::LLVector4(const F64 *vec)
+{
+        mV[VX] = (F32) vec[VX];
+        mV[VY] = (F32) vec[VY];
+        mV[VZ] = (F32) vec[VZ];
+        mV[VW] = (F32) vec[VW];
+}
+
 inline LLVector4::LLVector4(const LLVector3 &vec)
 {
         mV[VX] = vec.mV[VX];