diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-08 09:10:22 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-08 09:10:22 -0400 |
| commit | 93029a5a66f6797391a86affa40eb6185e291efc (patch) | |
| tree | 1da629a2543f49ffb7cbe0e6095ff21f8a1ba711 /indra/llmath/v4color.cpp | |
| parent | 322767f98e3c3164e3be03daa85580038ca6fb52 (diff) | |
| parent | 322c4c6bec54b4968d0105cf1bb28bb62c6dfcbc (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'indra/llmath/v4color.cpp')
| -rw-r--r-- | indra/llmath/v4color.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/v4color.cpp b/indra/llmath/v4color.cpp index 79a64b24f2..a8768bda35 100644 --- a/indra/llmath/v4color.cpp +++ b/indra/llmath/v4color.cpp @@ -122,7 +122,7 @@ LLColor4 LLColor4::cyan6(0.2f, 0.6f, 0.6f, 1.0f); ////////////////////////////////////////////////////////////////////////////// // conversion -LLColor4::operator const LLColor4U() const +LLColor4::operator LLColor4U() const { return LLColor4U( (U8)llclampb(ll_round(mV[VRED]*255.f)), |