diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-04-01 12:31:20 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-04-01 12:31:20 -0700 |
| commit | 961d52fbd3d8f5cc14aad2da93455e9e21873793 (patch) | |
| tree | 1f1c1297a0dc758bc180c01c0b28b22be19488b0 | |
| parent | 2fde4a9ae55a8641a5a7a9091af4d598b7e8d847 (diff) | |
NORSPEC-47 alpha mode enabled for textures without alpha channels
| -rw-r--r-- | indra/newview/llpanelface.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 754a13dd4c..0d7b4b88c9 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -694,7 +694,24 @@ void LLPanelFace::getState() } } func2; identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func2, image_format ); - mIsAlpha = image_format != GL_RGB; + + mIsAlpha = FALSE; + switch (image_format) + { + case GL_RGBA: + case GL_ALPHA: + { + mIsAlpha = TRUE; + } + break; + + case GL_RGB: break; + default: + { + llwarns << "Unexpected tex format in LLPanelFace...resorting to no alpha" << llendl; + } + break; + } if(LLViewerMedia::textureHasMedia(id)) { |