From d659b29f6ca180cac774e4576bba9da791510633 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Tue, 30 Apr 2013 13:44:35 -0700
Subject: Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XML

---
 indra/newview/llpanelface.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'indra/newview/llpanelface.cpp')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index d106de3d73..be1561d9a0 100755
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -812,7 +812,7 @@ void LLPanelFace::getState()
 				updateAlphaControls(getChild<LLComboBox>("combobox alphamode"),this);
 			}
 			
-			if(texture_ctrl)
+			if(texture_ctrl && !texture_ctrl->isPickerShown())
 			{
                 if (identical_diffuse)
 				{
@@ -848,7 +848,7 @@ void LLPanelFace::getState()
                 }
             }
             
-            if (shinytexture_ctrl)
+            if (shinytexture_ctrl && !shinytexture_ctrl->isPickerShown())
             {
                 if (identical_spec)
                 {
@@ -870,7 +870,7 @@ void LLPanelFace::getState()
                 }
             }
 
-            if (bumpytexture_ctrl)
+            if (bumpytexture_ctrl && !bumpytexture_ctrl->isPickerShown())
             {
                 if (identical_norm)
 				{
@@ -1655,12 +1655,13 @@ void LLPanelFace::getState()
 
 void LLPanelFace::refresh()
 {
+	LL_DEBUGS("Materials") << LL_ENDL;
 	getState();
 }
 
 void LLPanelFace::onMaterialLoaded(const LLMaterialID& material_id, const LLMaterialPtr material)
 { //laying out UI based on material parameters (calls setVisible on various components)
-	LL_DEBUGS("Materials") << "Loaded material " << material_id.asString() << material->asLLSD() << LL_ENDL;
+	LL_DEBUGS("Materials") << "material id " << material_id.asString() << " data " << material->asLLSD() << LL_ENDL;
 	
 	//make a local copy of the material for editing 
 	// (prevents local edits from overwriting client state on shared materials)
@@ -1940,7 +1941,7 @@ void LLPanelFace::onCommitMaterialsMedia(LLUICtrl* ctrl, void* userdata)
 	LLComboBox* combo_bumpiness = self->getChild<LLComboBox>("combobox bumpiness");
 	if (!combo_mattype || !combo_matmedia || !combo_shininess || !combo_bumpiness)
 	{
-		llwarns << "Combo box not found...exiting." << llendl;
+		LL_WARNS("Materials") << "Combo box not found...exiting." << LL_ENDL;
 		return;
 	}
 	U32 materials_media = combo_matmedia->getCurrentIndex();
@@ -2126,7 +2127,7 @@ void LLPanelFace::updateBumpyControls(LLUICtrl* ctrl, void* userdata, bool mess_
 	LLPanelFace* self = (LLPanelFace*) userdata;
 	LLTextureCtrl* texture_ctrl = self->getChild<LLTextureCtrl>("bumpytexture control");
 	LLUUID bumpy_texture_ID = texture_ctrl->getImageAssetID();
-	LL_DEBUGS("Materials") << "Bumpy texture selected: " << bumpy_texture_ID << LL_ENDL;
+	LL_DEBUGS("Materials") << "texture: " << bumpy_texture_ID << (mess_with_combobox ? "" : " do not") << " update combobox" << LL_ENDL;
 	LLComboBox* comboBumpy = self->getChild<LLComboBox>("combobox bumpiness");
 	if (!comboBumpy)
 	{
@@ -2452,6 +2453,7 @@ void LLPanelFace::onCommitPlanarAlign(LLUICtrl* ctrl, void* userdata)
 
 void LLPanelFace::onTextureSelectionChanged(LLInventoryItem* itemp)
 {
+	LL_DEBUGS("Materials") << "item asset " << itemp->getAssetUUID() << LL_ENDL;
 	LLComboBox* combo_mattype = getChild<LLComboBox>("combobox mattype");
 	if (!combo_mattype)
 	{
@@ -2469,7 +2471,7 @@ void LLPanelFace::onTextureSelectionChanged(LLInventoryItem* itemp)
 			break;
 		// no default needed
 	}
-		
+	LL_DEBUGS("Materials") << "control " << which_control << LL_ENDL;
 	LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>(which_control);
 	if (texture_ctrl)
 	{
-- 
cgit v1.2.3