Merge

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/llui/llmultislider.h b/indra/llui/llmultislider.h
index 50cf62e9c5..b0fca2597d 100644
--- a/indra/llui/llmultislider.h
+++ b/indra/llui/llmultislider.h
@@ -80,6 +80,11 @@ public:
 	void				setSliderValue(const std::string& name, F32 value, BOOL from_event = FALSE);
 	F32					getSliderValue(const std::string& name) const;
 	F32					getSliderValueFromPos(S32 xpos, S32 ypos) const;
+    LLRect              getSliderThumbRect(const std::string& name) const;
+
+    void                setSliderThumbImage(const std::string &name);
+    void                clearSliderThumbImage();
+
 
 	const std::string&	getCurSlider() const					{ return mCurSlider; }
 	F32					getCurSliderValue() const				{ return getSliderValue(mCurSlider); }
@@ -112,6 +117,7 @@ public:
 	F32				getOverlapThreshold() { return mOverlapThreshold; }
 	bool			canAddSliders() { return mValue.size() < mMaxNumSliders; }
 
+
 protected:
 	LLSD			mValue;
 	std::string		mCurSlider;