Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bugs introduced in 77a13963bb

Browse Source 
Fixes Shiny/Bumpy combo boxes being broken
Fixes UI warning for "label glossy" not existing, it was "label glossiness".
This commit is contained in:
Inusaito Sayori
2014-05-20 23:37:59 -04:00
parent 82044399e4
commit c684987908
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llpanelface.cpp
View File

@@ -128,7 +128,7 @@ BOOL LLPanelFace::postBuild()
mMediaDelete = getChildView("delete_media"); mMediaDelete = getChildView("delete_media");
// Label caching // Label caching
mLabelGlossy = getChildView("label glossy"); mLabelGlossy = getChildView("label glossiness");
mLabelEnvironment = getChildView("label environment"); mLabelEnvironment = getChildView("label environment");
mLabelShinyColor = getChildView("label shinycolor"); mLabelShinyColor = getChildView("label shinycolor");
mLabelAlphaMode = getChildView("label alphamode"); mLabelAlphaMode = getChildView("label alphamode");
@@ -170,8 +170,8 @@ BOOL LLPanelFace::postBuild()
mCtrlCopy = getChild<LLUICtrl>("copytextures"); mCtrlCopy = getChild<LLUICtrl>("copytextures");
mCtrlPaste = getChild<LLUICtrl>("pastetextures"); mCtrlPaste = getChild<LLUICtrl>("pastetextures");
mComboShiny->setCommitCallback(boost::bind(&LLPanelFace::sendShiny, this, boost::bind(&LLSD::asInteger, _2))); mComboShiny->setCommitCallback(boost::bind(&LLPanelFace::sendShiny, this, boost::bind(&LLComboBox::getCurrentIndex, mComboShiny)));
mComboBumpy->setCommitCallback(boost::bind(&LLPanelFace::sendBump, this, boost::bind(&LLSD::asInteger, _2))); mComboBumpy->setCommitCallback(boost::bind(&LLPanelFace::sendBump, this, boost::bind(&LLComboBox::getCurrentIndex, mComboBumpy)));
mComboAlpha->setCommitCallback(boost::bind(&LLPanelFace::onCommitAlphaMode, this)); mComboAlpha->setCommitCallback(boost::bind(&LLPanelFace::onCommitAlphaMode, this));
mCtrlTexScaleU->setCommitCallback(boost::bind(&LLPanelFace::onCommitTextureInfo, this)); mCtrlTexScaleU->setCommitCallback(boost::bind(&LLPanelFace::onCommitTextureInfo, this));
mCtrlFlipTexScaleU->setCommitCallback(boost::bind(&LLPanelFace::onCommitFlip, this, true)); mCtrlFlipTexScaleU->setCommitCallback(boost::bind(&LLPanelFace::onCommitFlip, this, true));