diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-12-10 17:18:29 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-12-10 17:18:29 +0000 |
| commit | a20b5bd51e5d1c193ebeff6bc4539c3385bd6e00 (patch) | |
| tree | 44f996bdb0d5d5b68561cf9a6bc86be7f971c2ca /indra/llui/llmultislider.h | |
| parent | ca336f26db4446b016ab89654bf75f7651294533 (diff) | |
| parent | 6762c4515a9b0f98164d6efd191abec5ca4dd211 (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.h')
| -rw-r--r-- | indra/llui/llmultislider.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llmultislider.h b/indra/llui/llmultislider.h index 52c6d1ddef..50cf62e9c5 100644 --- a/indra/llui/llmultislider.h +++ b/indra/llui/llmultislider.h @@ -96,7 +96,7 @@ public: bool findUnusedValue(F32& initVal); const std::string& addSlider(); const std::string& addSlider(F32 val); - void addSlider(F32 val, const std::string& name); + bool addSlider(F32 val, const std::string& name); void deleteSlider(const std::string& name); void deleteCurSlider() { deleteSlider(mCurSlider); } void clear(); @@ -109,6 +109,7 @@ public: S32 getMaxNumSliders() { return mMaxNumSliders; } S32 getCurNumSliders() { return mValue.size(); } + F32 getOverlapThreshold() { return mOverlapThreshold; } bool canAddSliders() { return mValue.size() < mMaxNumSliders; } protected: |