SL-1961 EEP correct disabling of altitude multislider and cleanup

4 files changed, 19 insertions, 7 deletions

diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp
index c35b7c5496..ece6edd285 100644
--- a/indra/llui/llmultislider.cpp
+++ b/indra/llui/llmultislider.cpp
@@ -731,7 +731,14 @@ void LLMultiSlider::draw()
 			// the draw command
 			if (mThumbImagep)
 			{
-				mThumbImagep->draw(mIt->second);
+				if (getEnabled())
+				{
+					mThumbImagep->draw(mIt->second);
+				}
+				else
+				{
+					mThumbImagep->draw(mIt->second, LLColor4::grey % 0.8f);
+				}
 			}
 			else if (capture == this)
 			{
@@ -748,7 +755,14 @@ void LLMultiSlider::draw()
 		{
 			if (mThumbImagep)
 			{
-				mThumbImagep->draw(curSldrIt->second);
+				if (getEnabled())
+				{
+					mThumbImagep->draw(curSldrIt->second);
+				}
+				else
+				{
+					mThumbImagep->draw(curSldrIt->second, LLColor4::grey % 0.8f);
+				}
 			}
 			else if (capture == this)
 			{
diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp
index 6925c0a130..62df5a2c38 100644
--- a/indra/llui/llslider.cpp
+++ b/indra/llui/llslider.cpp
@@ -42,7 +42,6 @@ static LLDefaultChildRegistry::Register<LLSlider> r1("slider_bar");
 
 LLSlider::Params::Params()
 :	orientation ("orientation", std::string ("horizontal")),
-	track_color("track_color"),
 	thumb_outline_color("thumb_outline_color"),
 	thumb_center_color("thumb_center_color"),
 	thumb_image("thumb_image"),
@@ -60,7 +59,6 @@ LLSlider::LLSlider(const LLSlider::Params& p)
 :	LLF32UICtrl(p),
 	mMouseOffset( 0 ),
 	mOrientation ((p.orientation() == "horizontal") ? HORIZONTAL : VERTICAL),
-	mTrackColor(p.track_color()),
 	mThumbOutlineColor(p.thumb_outline_color()),
 	mThumbCenterColor(p.thumb_center_color()),
 	mThumbImage(p.thumb_image),
diff --git a/indra/llui/llslider.h b/indra/llui/llslider.h
index 3b492d8182..484a5373b3 100644
--- a/indra/llui/llslider.h
+++ b/indra/llui/llslider.h
@@ -38,8 +38,7 @@ public:
 	{
 		Optional<std::string> orientation;
 
-		Optional<LLUIColor>	track_color,
-							thumb_outline_color,
+		Optional<LLUIColor>	thumb_outline_color,
 							thumb_center_color;
 
 		Optional<LLUIImage*>	thumb_image,
@@ -99,7 +98,6 @@ private:
 	const EOrientation	mOrientation;
 
 	LLRect		mThumbRect;
-	LLUIColor	mTrackColor;
 	LLUIColor	mThumbOutlineColor;
 	LLUIColor	mThumbCenterColor;
 	
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp
index ee66c5c15b..5abef949e1 100644
--- a/indra/newview/llpanelenvironment.cpp
+++ b/indra/newview/llpanelenvironment.cpp
@@ -388,6 +388,8 @@ bool LLPanelEnvironmentInfo::setControlsEnabled(bool enabled)
     getChild<LLUICtrl>(BTN_EDIT)->setEnabled(enabled);
     getChild<LLUICtrl>(SLD_DAYLENGTH)->setEnabled(enabled && (rdo_selection != 0) && !is_legacy);
     getChild<LLUICtrl>(SLD_DAYOFFSET)->setEnabled(enabled && (rdo_selection != 0) && !is_legacy);
+    getChild<LLUICtrl>(SLD_ALTITUDES)->setEnabled(enabled && isRegion() && !is_legacy);
+    getChild<LLUICtrl>(ICN_GROUND)->setColor((enabled && isRegion() && !is_legacy) ? LLColor4::white : LLColor4::grey % 0.8f);
     getChild<LLUICtrl>(PNL_ENVIRONMENT_ALTITUDES)->setEnabled(enabled && isRegion() && !is_legacy);
     getChild<LLUICtrl>(CHK_ALLOWOVERRIDE)->setEnabled(enabled && isRegion() && !is_legacy);
     getChild<LLUICtrl>(BTN_APPLY)->setEnabled(enabled && (mDirtyFlag != 0));