summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xindra/newview/llpanelface.cpp6
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>