diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/llmath/v3color.cpp | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/llmath/v3color.cpp')
| -rw-r--r-- | indra/llmath/v3color.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llmath/v3color.cpp b/indra/llmath/v3color.cpp index 462075c763..8a49be5615 100644 --- a/indra/llmath/v3color.cpp +++ b/indra/llmath/v3color.cpp @@ -33,6 +33,7 @@ #include "v3color.h" #include "v4color.h" +#include "v4math.h" LLColor3 LLColor3::white(1.0f, 1.0f, 1.0f); LLColor3 LLColor3::black(0.0f, 0.0f, 0.0f); @@ -45,6 +46,13 @@ LLColor3::LLColor3(const LLColor4 &a) mV[2] = a.mV[2]; } +LLColor3::LLColor3(const LLVector4 &a) +{ + mV[0] = a.mV[0]; + mV[1] = a.mV[1]; + mV[2] = a.mV[2]; +} + LLColor3::LLColor3(const LLSD &sd) { mV[0] = (F32) sd[0].asReal(); |