From 287b631d9a959399822076c5bbb415d51cf080cd Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Tue, 28 May 2013 15:57:01 -0700
Subject: NORSPEC-211 less intrusive version of this fix

---
 indra/newview/llpanelface.cpp | 47 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 81243484c1..b7dc838601 100755
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1822,10 +1822,7 @@ void LLPanelFace::updateMaterial()
 		LLMaterialPtr material( (!new_material) ? new LLMaterial(cur_material->asLLSD()) : new LLMaterial());
 		llassert_always(material);
 
-		if (!is_default_blend_mode)
-		{
-			material->setDiffuseAlphaMode(getChild<LLComboBox>("combobox alphamode")->getCurrentIndex());			
-		}
+		material->setDiffuseAlphaMode(getChild<LLComboBox>("combobox alphamode")->getCurrentIndex());
 		material->setAlphaMaskCutoff((U8)(getChild<LLUICtrl>("maskcutoff")->getValue().asInteger()));
 
 		if (!norm_map_id.isNull() && (bumpiness == BUMPY_TEXTURE))
@@ -2269,6 +2266,48 @@ void LLPanelFace::onSelectTexture(const LLSD& data)
 {
 	LLSelectMgr::getInstance()->saveSelectedObjectTextures();
 	sendTexture();
+
+	LLGLenum image_format;
+	struct f2 : public LLSelectedTEGetFunctor<LLGLenum>
+	{
+		LLGLenum get(LLViewerObject* object, S32 te_index)
+		{
+			LLGLenum image_format = GL_RGB;
+					
+			LLViewerTexture* image = object->getTEImage(te_index);
+			if (image) image_format  = image->getPrimaryFormat();
+			return image_format;
+		}
+	} func2;
+	LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func2, image_format );
+    
+	LLCtrlSelectionInterface* combobox_alphamode =
+		childGetSelectionInterface("combobox alphamode");
+
+	U32 alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
+	if (combobox_alphamode)
+	{
+		switch (image_format)
+		{
+		case GL_RGBA:
+		case GL_ALPHA:
+			{
+				alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_BLEND;
+			}
+			break;
+
+		case GL_RGB: break;
+		default:
+			{
+				llwarns << "Unexpected tex format in LLPanelFace...resorting to no alpha" << llendl;
+			}
+			break;
+		}
+
+		combobox_alphamode->selectNthItem(alpha_mode);
+	}
+
+	updateMaterial();
 }
 
 void LLPanelFace::onCommitSpecularTexture( const LLSD& data )
-- 
cgit v1.2.3