diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-13 10:48:55 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-13 10:48:55 -0700 |
| commit | 53de3916a16e316543cd12491556999a4c84f545 (patch) | |
| tree | cf4ae7e25f5a8ec7b719f6dd212ddf1d620908e1 | |
| parent | 86a38d1ea262eff4b9912d107cf79039ca7b0fa7 (diff) | |
Explicit cast for LLUIColor
| -rw-r--r-- | indra/llui/llmultislider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp index caf9f06074..ef907e620e 100644 --- a/indra/llui/llmultislider.cpp +++ b/indra/llui/llmultislider.cpp @@ -140,7 +140,7 @@ LLMultiSlider::LLMultiSlider(const LLMultiSlider::Params& p) { mThumbImagep = LLUI::getUIImage(p.thumb_image()); } - mThumbHighlightColor = p.thumb_highlight_color.isProvided() ? p.thumb_highlight_color() : gFocusMgr.getFocusColor(); + mThumbHighlightColor = p.thumb_highlight_color.isProvided() ? p.thumb_highlight_color() : static_cast<LLUIColor>(gFocusMgr.getFocusColor()); } LLMultiSlider::~LLMultiSlider() |