diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-01 08:11:15 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-01 08:11:15 -0700 |
| commit | 025c8909582f59f68f786d52bea06f5a272df0b5 (patch) | |
| tree | 6d9980e216f89c74776155432b32e6778f3b6367 /indra/newview/llpanelface.cpp | |
| parent | 536a30d7f2083d39dbd6d06f16fa53064c3ee379 (diff) | |
| parent | 70c1e21956b8589c9873ac5fa6a05467dc2e0a89 (diff) | |
Merge vwr-dev-mat
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rwxr-xr-x | indra/newview/llpanelface.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index be1561d9a0..67ef072508 100755 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -396,10 +396,6 @@ struct LLPanelFaceSetTEFunctor : public LLSelectedTEFunctor if (valid) { value = ctrlTexScaleS->get(); - //if( checkFlipScaleS->get() ) - //{ - // value = -value; - //} if (comboTexGen && comboTexGen->getCurrentIndex() == 1) { @@ -634,20 +630,11 @@ void LLPanelFace::getState() } else { - llwarns << "failed getChild for 'combobox mattype'" << llendl; + LL_WARNS("Materials") << "failed getChild for 'combobox mattype'" << LL_ENDL; } getChildView("combobox mattype")->setEnabled(editable); onCommitMaterialsMedia(NULL, this); - - //if ( LLMediaEngine::getInstance()->getMediaRenderer () ) - // if ( LLMediaEngine::getInstance()->getMediaRenderer ()->isLoaded () ) - // { - // - // //mLabelTexAutoFix->setEnabled ( editable ); - // - // //mBtnAutoFix->setEnabled ( editable ); - // } bool identical; bool identical_diffuse; |