From 5ec8bbbe2244ea70d8aa74b5c572351632699425 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Wed, 10 Oct 2007 00:01:43 +0000
Subject: svn merge -r71238:71367
 svn+ssh://svn/svn/linden/branches/maint-ui-qa3

---
 indra/newview/llpanelobject.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 412ca3b53d..cf507098f7 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -98,7 +98,7 @@ enum {
 	MI_HOLE_COUNT
 };
 
-//XUI:translate (depricated, so very low priority)
+//*TODO:translate (depricated, so very low priority)
 static const LLString LEGACY_FULLBRIGHT_DESC("Fullbright (Legacy)");
 
 BOOL	LLPanelObject::postBuild()
@@ -163,7 +163,7 @@ BOOL	LLPanelObject::postBuild()
 	mComboMaterial = gUICtrlFactory->getComboBoxByName(this,"material");
 	childSetCommitCallback("material",onCommitMaterial,this);
 	mComboMaterial->removeall();
-	// XUI:translate
+	// *TODO:translate
 	LLMaterialInfo *minfop;
 	for (minfop = LLMaterialTable::basic.mMaterialInfoList.getFirstData(); 
 		 minfop != NULL; 
@@ -509,8 +509,17 @@ void LLPanelObject::getState( )
 #endif
 	
 	// Update material part
-	U8 material_code;
-	BOOL material_same = gSelectMgr->selectionGetMaterial(&material_code);
+	// slightly inefficient - materials are unique per object, not per TE
+	U8 material_code = 0;
+	struct f : public LLSelectedTEGetFunctor<U8>
+	{
+		U8 get(LLViewerObject* object, S32 te)
+		{
+			return object->getMaterial();
+		}
+	} func;
+	bool material_same = gSelectMgr->getSelection()->getSelectedTEValue( &func, material_code );
+	
 	if (editable && single_volume && material_same)
 	{
 		mComboMaterial->setEnabled( TRUE );
@@ -529,7 +538,8 @@ void LLPanelObject::getState( )
 			{
 				mComboMaterial->remove(LEGACY_FULLBRIGHT_DESC);
 			}
-			mComboMaterial->setSimple(LLMaterialTable::basic.getName(material_code));
+			// *TODO:Translate
+			mComboMaterial->setSimple(LLString(LLMaterialTable::basic.getName(material_code)));
 		}
 	}
 	else
-- 
cgit v1.2.3