Second Life viewer sources 1.19.1.0

1 files changed, 9 insertions, 1 deletions

diff --git a/linden/indra/llmath/v4color.cpp b/linden/indra/llmath/v4color.cpp
index b1884b7..8e6907e 100644
--- a/linden/indra/llmath/v4color.cpp
+++ b/linden/indra/llmath/v4color.cpp
@@ -36,7 +36,7 @@
 #include "v4color.h"
 #include "v4coloru.h"
 #include "v3color.h"
-//#include "vmath.h"
+#include "v4math.h"
 #include "llmath.h"
 
 // LLColor4
@@ -153,6 +153,14 @@ LLColor4::LLColor4(const LLColor4U& color4u)
         mV[VW] = color4u.mV[VW] * SCALE;
 }
 
+LLColor4::LLColor4(const LLVector4& vector4)
+{
+        mV[VX] = vector4.mV[VX];
+        mV[VY] = vector4.mV[VY];
+        mV[VZ] = vector4.mV[VZ];
+        mV[VW] = vector4.mV[VW];
+}
+
 const LLColor4& LLColor4::setVec(const LLColor4U& color4u)
 {
         const F32 SCALE = 1.f/255.f;