diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-06-11 13:54:03 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-11 13:54:03 -0700 |
| commit | 7fcbb7c177ba0c7fe3c0e97f95544481a279bf7f (patch) | |
| tree | f9287cd4902b3b5593a22d95ce2cd2ab3357eea1 /indra/newview/llpanelface.cpp | |
| parent | 87946113cc2a6f0d60c11275bf4aa168c2ea19d6 (diff) | |
Fix build failure from warning and dav3p no-JIRA bug about normal map scale editing
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rwxr-xr-x | indra/newview/llpanelface.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 5d5df01782..c446132289 100755 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -772,10 +772,6 @@ void LLPanelFace::updateUI() // Normal map LLSelectedTEMaterial::getNormalID(normmap_id, identical_norm); - if (bumpy != BUMPY_TEXTURE) - { - normmap_id = LLUUID::null; - } mIsAlpha = FALSE; LLGLenum image_format = GL_RGB; @@ -2318,8 +2314,6 @@ void LLPanelFace::LLSelectedTEMaterial::getCurrentDiffuseAlphaMode(U8& diffuse_a identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &get_diff_mode, diffuse_alpha_mode); } -static void getCurrentDiffuseAlphaMode(U8& diffuse_alpha_mode, bool& identical); - void LLPanelFace::LLSelectedTE::getObjectScaleS(F32& scale_s, bool& identical) { struct LLSelectedTEGetObjectScaleS : public LLSelectedTEGetFunctor<F32> |