summaryrefslogtreecommitdiff
path: root/indra/llui/llmultislider.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/llmultislider.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/llmultislider.cpp')
-rw-r--r--indra/llui/llmultislider.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp
index 9a7b6f9f6b..ed93b3d44c 100644
--- a/indra/llui/llmultislider.cpp
+++ b/indra/llui/llmultislider.cpp
@@ -354,17 +354,17 @@ const std::string& LLMultiSlider::addSlider(F32 val)
return mCurSlider;
}
-void LLMultiSlider::addSlider(F32 val, const std::string& name)
+bool LLMultiSlider::addSlider(F32 val, const std::string& name)
{
F32 initVal = val;
if(mValue.size() >= mMaxNumSliders) {
- return;
+ return false;
}
bool foundOne = findUnusedValue(initVal);
if(!foundOne) {
- return;
+ return false;
}
// add a new thumb rect
@@ -383,6 +383,8 @@ void LLMultiSlider::addSlider(F32 val, const std::string& name)
// move the slider
setSliderValue(mCurSlider, initVal, TRUE);
+
+ return true;
}
bool LLMultiSlider::findUnusedValue(F32& initVal)