1 files changed, 55 insertions, 24 deletions

diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp
index 0aa3e17075..5cfe79267f 100644
--- a/indra/llui/llmultislider.cpp
+++ b/indra/llui/llmultislider.cpp
@@ -196,7 +196,11 @@ void LLMultiSlider::setValue(const LLSD& value)
 
 F32 LLMultiSlider::getSliderValue(const std::string& name) const
 {
-	return (F32)mValue[name].asReal();
+	if (mValue.has(name))
+	{
+		return (F32)mValue[name].asReal();
+	}
+	return 0;
 }
 
 void LLMultiSlider::setCurSlider(const std::string& name)
@@ -206,6 +210,24 @@ void LLMultiSlider::setCurSlider(const std::string& name)
 	}
 }
 
+F32 LLMultiSlider::getSliderValueFromX(S32 xpos) const
+{
+    S32 left_edge = mThumbWidth / 2;
+    S32 right_edge = getRect().getWidth() - (mThumbWidth / 2);
+
+    xpos += mMouseOffset;
+    xpos = llclamp(xpos, left_edge, right_edge);
+
+    F32 t = F32(xpos - left_edge) / (right_edge - left_edge);
+
+    return((t * (mMaxValue - mMinValue)) + mMinValue);
+}
+
+void LLMultiSlider::resetCurSlider()
+{
+	mCurSlider = LLStringUtil::null;
+}
+
 const std::string& LLMultiSlider::addSlider()
 {
 	return addSlider(mInitialValue);
@@ -334,10 +356,15 @@ void LLMultiSlider::deleteSlider(const std::string& name)
 
 void LLMultiSlider::clear()
 {
-	while(mThumbRects.size() > 0) {
+	while(mThumbRects.size() > 0 && mValue.size() > 0) {
 		deleteCurSlider();
 	}
 
+	if (mThumbRects.size() > 0 || mValue.size() > 0)
+	{
+		LL_WARNS() << "Failed to fully clear Multi slider" << LL_ENDL;
+	}
+
 	LLF32UICtrl::clear();
 }
 
@@ -345,14 +372,15 @@ BOOL LLMultiSlider::handleHover(S32 x, S32 y, MASK mask)
 {
 	if( gFocusMgr.getMouseCapture() == this )
 	{
-		S32 left_edge = mThumbWidth/2;
-		S32 right_edge = getRect().getWidth() - (mThumbWidth/2);
-
-		x += mMouseOffset;
-		x = llclamp( x, left_edge, right_edge );
-
-		F32 t = F32(x - left_edge) / (right_edge - left_edge);
-		setCurSliderValue(t * (mMaxValue - mMinValue) + mMinValue );
+// 		S32 left_edge = mThumbWidth/2;
+// 		S32 right_edge = getRect().getWidth() - (mThumbWidth/2);
+// 
+// 		x += mMouseOffset;
+// 		x = llclamp( x, left_edge, right_edge );
+// 
+// 		F32 t = F32(x - left_edge) / (right_edge - left_edge);
+// 		setCurSliderValue(t * (mMaxValue - mMinValue) + mMinValue );
+        setCurSliderValue(getSliderValueFromX(x));
 		onCommit();
 
 		getWindow()->setCursor(UI_CURSOR_ARROW);
@@ -416,20 +444,23 @@ BOOL LLMultiSlider::handleMouseDown(S32 x, S32 y, MASK mask)
 			}
 		}
 
-		// Find the offset of the actual mouse location from the center of the thumb.
-		if (mThumbRects[mCurSlider].pointInRect(x,y))
-		{
-			mMouseOffset = (mThumbRects[mCurSlider].mLeft + mThumbWidth/2) - x;
-		}
-		else
+		if (!mCurSlider.empty())
 		{
-			mMouseOffset = 0;
-		}
+			// Find the offset of the actual mouse location from the center of the thumb.
+			if (mThumbRects[mCurSlider].pointInRect(x,y))
+			{
+				mMouseOffset = (mThumbRects[mCurSlider].mLeft + mThumbWidth/2) - x;
+			}
+			else
+			{
+				mMouseOffset = 0;
+			}
 
-		// Start dragging the thumb
-		// No handler needed for focus lost since this class has no state that depends on it.
-		gFocusMgr.setMouseCapture( this );
-		mDragStartThumbRect = mThumbRects[mCurSlider];				
+			// Start dragging the thumb
+			// No handler needed for focus lost since this class has no state that depends on it.
+			gFocusMgr.setMouseCapture( this );
+			mDragStartThumbRect = mThumbRects[mCurSlider];
+		}
 	}
 	make_ui_sound("UISndClick");
 
@@ -546,7 +577,7 @@ void LLMultiSlider::draw()
 		thumb_imagep->drawSolid(mDragStartThumbRect, mThumbCenterColor.get() % 0.3f);
 
 		// draw the highlight
-		if (hasFocus())
+		if (hasFocus() && !mCurSlider.empty())
 		{
 			thumb_imagep->drawBorder(mThumbRects[mCurSlider], gFocusMgr.getFocusColor(), gFocusMgr.getFocusFlashWidth());
 		}
@@ -578,7 +609,7 @@ void LLMultiSlider::draw()
 	else
 	{ 
 		// draw highlight
-		if (hasFocus())
+		if (hasFocus() && !mCurSlider.empty())
 		{
 			thumb_imagep->drawBorder(mThumbRects[mCurSlider], gFocusMgr.getFocusColor(), gFocusMgr.getFocusFlashWidth());
 		}