Second Life viewer sources 1.18.4.0-RC

1 files changed, 18 insertions, 5 deletions

diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index a8411df..cf50709 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -2,6 +2,8 @@
  * @file llpanelobject.cpp
  * @brief Object editing (position, scale, etc.) in the tools floater
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "llviewerprecompiledheaders.h"
@@ -95,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()
@@ -160,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; 
@@ -506,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 );
@@ -526,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