From 81781bf0d85eb7d37f6b4d1a9abebab4c9b0af0e Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Thu, 11 Apr 2013 10:21:33 -0500
Subject: [PATCH] NORSPEC-94: Set default specular color to white.
---
indra/newview/llpanelface.cpp | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 9af4bed9185..a0f2fb702ea 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;
--
GitLab