diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-13 16:31:36 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-13 16:31:36 +0000 |
| commit | 079f5f6da9d7ad92add9d5b1111a4f0be52f32c9 (patch) | |
| tree | 1e6c040b7a43a9114f07a357e751e4ca06a2b70a /indra/llui | |
| parent | 3af4837032245403f0c37fe300834fab751e320a (diff) | |
| parent | bb52cdf4f0104cb61c537041fc9574167fdf98eb (diff) | |
Merged in andreykproductengine/maint-eep2 (pull request #82)
SL-1168 and SL-1307
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llmultislider.h | 4 | ||||
| -rw-r--r-- | indra/llui/llmultisliderctrl.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/llmultislider.h b/indra/llui/llmultislider.h index a068b461e0..52c6d1ddef 100644 --- a/indra/llui/llmultislider.h +++ b/indra/llui/llmultislider.h @@ -107,6 +107,10 @@ public: /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask); /*virtual*/ void draw(); + S32 getMaxNumSliders() { return mMaxNumSliders; } + S32 getCurNumSliders() { return mValue.size(); } + bool canAddSliders() { return mValue.size() < mMaxNumSliders; } + protected: LLSD mValue; std::string mCurSlider; diff --git a/indra/llui/llmultisliderctrl.h b/indra/llui/llmultisliderctrl.h index 74eaf69987..c370ebf505 100644 --- a/indra/llui/llmultisliderctrl.h +++ b/indra/llui/llmultisliderctrl.h @@ -118,6 +118,10 @@ public: F32 getMinValue() const { return mMultiSlider->getMinValue(); } F32 getMaxValue() const { return mMultiSlider->getMaxValue(); } + S32 getMaxNumSliders() { return mMultiSlider->getMaxNumSliders(); } + S32 getCurNumSliders() { return mMultiSlider->getCurNumSliders(); } + bool canAddSliders() { return mMultiSlider->canAddSliders(); } + void setLabel(const std::string& label) { if (mLabelBox) mLabelBox->setText(label); } void setLabelColor(const LLColor4& c) { mTextEnabledColor = c; } void setDisabledLabelColor(const LLColor4& c) { mTextDisabledColor = c; } |