summaryrefslogtreecommitdiff
path: root/indra/llui/llmultisliderctrl.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-12-10 17:18:29 +0000
committerRider Linden <rider@lindenlab.com>2018-12-10 17:18:29 +0000
commita20b5bd51e5d1c193ebeff6bc4539c3385bd6e00 (patch)
tree44f996bdb0d5d5b68561cf9a6bc86be7f971c2ca /indra/llui/llmultisliderctrl.cpp
parentca336f26db4446b016ab89654bf75f7651294533 (diff)
parent6762c4515a9b0f98164d6efd191abec5ca4dd211 (diff)
Merged in andreykproductengine/maint-eep (pull request #210)
SL-10091 and SL-1894 Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Diffstat (limited to 'indra/llui/llmultisliderctrl.cpp')
-rw-r--r--indra/llui/llmultisliderctrl.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llui/llmultisliderctrl.cpp b/indra/llui/llmultisliderctrl.cpp
index 972567ef9b..20e2b569f1 100644
--- a/indra/llui/llmultisliderctrl.cpp
+++ b/indra/llui/llmultisliderctrl.cpp
@@ -293,6 +293,17 @@ const std::string& LLMultiSliderCtrl::addSlider(F32 val)
return name;
}
+bool LLMultiSliderCtrl::addSlider(F32 val, const std::string& name)
+{
+ bool res = mMultiSlider->addSlider(val, name);
+ if (res)
+ {
+ mCurValue = mMultiSlider->getCurSliderValue();
+ updateText();
+ }
+ return res;
+}
+
void LLMultiSliderCtrl::deleteSlider(const std::string& name)
{
mMultiSlider->deleteSlider(name);