Merged lindenlab/viewer-development-materials into default

1 files changed, 12 insertions, 1 deletions

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index c55923599f..be88cb6ab6 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1374,10 +1374,21 @@ void LLPanelFace::getState()
 			getChildView("environment")->setEnabled(editable);
 			getChild<LLUICtrl>("environment")->setTentative(!identical);
 			getChildView("label environment")->setEnabled(editable);
-			getChildView("shinycolorswatch")->setEnabled(editable);
 			getChild<LLUICtrl>("shinycolorswatch")->setTentative(!identical);
 			getChildView("label shinycolor")->setEnabled(editable);
 		}
+		// NORSPEC-94: Set default specular color to white (will get
+		//		overwritten from material when loaded)
+		LLColorSwatchCtrl*	mShinyColorSwatch = getChild<LLColorSwatchCtrl>("shinycolorswatch");
+		color = LLColor4::white;
+		if(mShinyColorSwatch)
+		{
+			mShinyColorSwatch->setOriginal(color);
+			mShinyColorSwatch->set(color, TRUE);
+			mShinyColorSwatch->setValid(editable);
+			mShinyColorSwatch->setEnabled( editable );
+			mShinyColorSwatch->setCanApplyImmediately( editable );
+		}
 
 		U8 bumpy = 0;