From a1a6699684d3f80bd0c3fbb9e845ac9ff0986cec Mon Sep 17 00:00:00 2001
From: "Graham Madarasz (Graham Linden)" <graham@lindenlab.com>
Date: Tue, 2 Apr 2013 09:41:57 -0700
Subject: NORSPEC-23 and NORSPEC-47 fix llpanelface issues with reflecting
default alpha blend state and presence of multiple textures when editing at
face level
---
indra/newview/llpanelface.cpp | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 754a13dd4c..44f45e9995 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -693,8 +693,25 @@ void LLPanelFace::getState()
return image_format;
}
} func2;
- identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func2, image_format );
- mIsAlpha = image_format != GL_RGB;
+ identical &= LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func2, image_format );
+
+ mIsAlpha = FALSE;
+ switch (image_format)
+ {
+ case GL_RGBA:
+ case GL_ALPHA:
+ {
+ mIsAlpha = TRUE;
+ }
+ break;
+
+ case GL_RGB: break;
+ default:
+ {
+ llinfos << "Unexpected tex format in LLPanelFace...resorting to no alpha" << llendl;
+ }
+ break;
+ }
if(LLViewerMedia::textureHasMedia(id))
{
--
cgit v1.2.3