livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge NORSPEC-94

master
Oz Linden 2013-04-11 20:53:45 -04:00
parent a280ff382c 81781bf0d8
commit d8f2ecd5b3
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llpanelface.cpp
View File

@ -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;