From 53de3916a16e316543cd12491556999a4c84f545 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 13 Sep 2018 10:48:55 -0700 Subject: Explicit cast for LLUIColor --- indra/llui/llmultislider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(gFocusMgr.getFocusColor()); } LLMultiSlider::~LLMultiSlider() -- cgit v1.2.3