diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
| commit | a7911c43791a76f0f93f920f527970125afdc730 (patch) | |
| tree | 99228045170856cf7721e83274bc9d74b45f42a4 /indra/llmath/v4color.cpp | |
| parent | 444643aeb0b80fdfbe28e0e2faae56de9d4f6e4a (diff) | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
merge changes for 5.1.0-release
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)), |