Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559

1 files changed, 27 insertions, 74 deletions

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 2dad9cd2dc..b887b079ce 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -416,15 +416,6 @@ BOOL LLFloaterTexturePicker::postBuild()
 
 	mInventoryPanel = getChild<LLInventoryPanel>("inventory panel");
 
-    // if can select both materials and textures, set textures_material_combo's layout as visible
-    childSetVisible("combo_layout", mInventoryPickType == LLTextureCtrl::PICK_TEXTURE_MATERIAL);
-
-    mTextureMaterialsCombo = getChild<LLComboBox>("textures_material_combo");
-    mTextureMaterialsCombo->setCommitCallback(onSelectTextureMaterials, this);
-
-    // set the combo box to the first entry in the list (currently textures and materials)
-    mTextureMaterialsCombo->selectByValue(0);
-
 	mModeSelector = getChild<LLComboBox>("mode_selection");
 	mModeSelector->setCommitCallback(onModeSelect, this);
 	mModeSelector->selectByValue(0);
@@ -435,7 +426,7 @@ BOOL LLFloaterTexturePicker::postBuild()
         // selected at startup, we call the same function that is triggered
         // when a texture/materials/both choice is made and let it take care
         // of setting the filters
-        onSelectTextureMaterials(0, this);
+        refreshInventoryFilter();
 
 		mInventoryPanel->setFilterPermMask(mImmediateFilterPermMask);
 		mInventoryPanel->setSelectCallback(boost::bind(&LLFloaterTexturePicker::onSelectionChange, this, _1, _2));
@@ -469,21 +460,7 @@ BOOL LLFloaterTexturePicker::postBuild()
 
 	mLocalScrollCtrl = getChild<LLScrollListCtrl>("l_name_list");
 	mLocalScrollCtrl->setCommitCallback(onLocalScrollCommit, this);
-    mLocalScrollCtrl->clearRows();
-
-    if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE_MATERIAL)
-    {
-        LLLocalBitmapMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
-        LLLocalGLTFMaterialMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
-    }
-    else if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE)
-    {
-        LLLocalBitmapMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
-    }
-    else if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
-    {
-        LLLocalGLTFMaterialMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
-    }
+    refreshLocalList();
 
 	mNoCopyTextureSelected = FALSE;
 
@@ -843,7 +820,6 @@ void LLFloaterTexturePicker::onModeSelect(LLUICtrl* ctrl, void *userdata)
 	self->getChild<LLButton>("Blank")->setVisible(index == 0 ? TRUE : FALSE);
 	self->getChild<LLButton>("None")->setVisible(index == 0 ? TRUE : FALSE);
 	self->getChild<LLButton>("Pipette")->setVisible(index == 0 ? TRUE : FALSE);
-    self->getChild<LLComboBox>("textures_material_combo")->setVisible(index == 0 ? TRUE : FALSE);
 	self->getChild<LLFilterEditor>("inventory search editor")->setVisible(index == 0 ? TRUE : FALSE);
 	self->getChild<LLInventoryPanel>("inventory panel")->setVisible(index == 0 ? TRUE : FALSE);
 
@@ -963,21 +939,7 @@ void LLFloaterTexturePicker::onBtnRemove(void* userdata)
 
 		self->getChild<LLButton>("l_rem_btn")->setEnabled(false);
 		self->getChild<LLButton>("l_upl_btn")->setEnabled(false);
-        self->mLocalScrollCtrl->clearRows();
-
-        if (self->mInventoryPickType == LLTextureCtrl::PICK_TEXTURE_MATERIAL)
-        {
-            LLLocalBitmapMgr::getInstance()->feedScrollList(self->mLocalScrollCtrl);
-            LLLocalGLTFMaterialMgr::getInstance()->feedScrollList(self->mLocalScrollCtrl);
-        }
-        else if (self->mInventoryPickType == LLTextureCtrl::PICK_TEXTURE)
-        {
-            LLLocalBitmapMgr::getInstance()->feedScrollList(self->mLocalScrollCtrl);
-        }
-        else if (self->mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
-        {
-            LLLocalGLTFMaterialMgr::getInstance()->feedScrollList(self->mLocalScrollCtrl);
-        }
+        self->refreshLocalList();
 	}
 }
 
@@ -1205,36 +1167,46 @@ void LLFloaterTexturePicker::onFilterEdit(const std::string& search_string )
 	mInventoryPanel->setFilterSubString(search_string);
 }
 
-void LLFloaterTexturePicker::onSelectTextureMaterials(LLUICtrl* ctrl, void *userdata)
+void LLFloaterTexturePicker::refreshLocalList()
 {
-    LLFloaterTexturePicker* self = (LLFloaterTexturePicker*)userdata;
-    int index = self->mTextureMaterialsCombo->getValue().asInteger();
-
-    U32 filter_types = 0x0;
+    mLocalScrollCtrl->clearRows();
 
-    if (self->mInventoryPickType != LLTextureCtrl::PICK_TEXTURE_MATERIAL)
+    if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE_MATERIAL)
+    {
+        LLLocalBitmapMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
+        LLLocalGLTFMaterialMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
+    }
+    else if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE)
+    {
+        LLLocalBitmapMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
+    }
+    else if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
     {
-        // mInventoryPickType overrides combo
-        index = self->mInventoryPickType;
+        LLLocalGLTFMaterialMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
     }
+}
 
-    if (index == LLTextureCtrl::PICK_TEXTURE_MATERIAL)
+void LLFloaterTexturePicker::refreshInventoryFilter()
+{
+    U32 filter_types = 0x0;
+
+    if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE_MATERIAL)
     {
         filter_types |= 0x1 << LLInventoryType::IT_TEXTURE;
         filter_types |= 0x1 << LLInventoryType::IT_SNAPSHOT;
         filter_types |= 0x1 << LLInventoryType::IT_MATERIAL;
     }
-    else if (index == LLTextureCtrl::PICK_TEXTURE)
+    else if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE)
     {
         filter_types |= 0x1 << LLInventoryType::IT_TEXTURE;
         filter_types |= 0x1 << LLInventoryType::IT_SNAPSHOT;
     }
-    else if (index == LLTextureCtrl::PICK_MATERIAL)
+    else if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
     {
         filter_types |= 0x1 << LLInventoryType::IT_MATERIAL;
     }
 
-    self->mInventoryPanel->setFilterTypes(filter_types);
+    mInventoryPanel->setFilterTypes(filter_types);
 }
 
 void LLFloaterTexturePicker::setLocalTextureEnabled(BOOL enabled)
@@ -1267,27 +1239,8 @@ void LLFloaterTexturePicker::setBakeTextureEnabled(BOOL enabled)
 void LLFloaterTexturePicker::setInventoryPickType(LLTextureCtrl::EPickInventoryType type)
 {
     mInventoryPickType = type;
-
-    // if can select both materials and textures, set textures_material_combo's layout as visible
-    childSetVisible("combo_layout", mInventoryPickType == LLTextureCtrl::PICK_TEXTURE_MATERIAL);
-
-    mLocalScrollCtrl->clearRows();
-    if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE_MATERIAL)
-    {
-        LLLocalBitmapMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
-        LLLocalGLTFMaterialMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
-    }
-    else if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE)
-    {
-        LLLocalBitmapMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
-    }
-    else if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
-    {
-        LLLocalGLTFMaterialMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
-    }
-
-    // refresh filters
-    onSelectTextureMaterials(0, this);
+    refreshLocalList();
+    refreshInventoryFilter();
 }
 
 void LLFloaterTexturePicker::onPickerCallback(const std::vector<std::string>& filenames, LLHandle<LLFloater> handle)