summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-08-07 17:23:23 -0700
committerGraham Linden <graham@lindenlab.com>2013-08-07 17:23:23 -0700
commit9c1b45b16763d452a3c9175186217d005a9cfd2b (patch)
tree6ca303efc6b1aebed91f72c01f4c743ce03d81a6
parente156e3ff32469d5efdfd4fb96969b8cc4bc056b8 (diff)
NORSPEC-343 fix oversight and actually apply override to new material when no alpha is present
-rwxr-xr-xindra/newview/llpanelface.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index 86642e5635..562d293d56 100755
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -282,6 +282,7 @@ private:
if ((new_alpha_mode == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) && !is_alpha_face)
{
new_alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
+ new_material->setDiffuseAlphaMode(LLMaterial::DIFFUSE_ALPHA_MODE_NONE);
}
bool is_default_blend_mode = (new_alpha_mode == default_alpha_mode);