diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-12-11 08:00:22 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-12-11 08:00:22 -0800 |
| commit | 89385d1aa3ae18274a2049d2ca7472f1160e17d7 (patch) | |
| tree | b3824d53329c64b51468736d95a27f9d888fcef4 /indra/llui/llmultislider.h | |
| parent | 8c128f5b635b4ae8f36b37fde8702aedc2fad1cc (diff) | |
| parent | 87e83274f7f0be38c571c9f01848368d0fc160bf (diff) | |
Merge
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: |