diff options
Diffstat (limited to 'indra/newview')
3 files changed, 55 insertions, 2 deletions
diff --git a/indra/newview/llfloaterinventorythumbnailshelper.cpp b/indra/newview/llfloaterinventorythumbnailshelper.cpp index abd5e01e5d..9697fc3d51 100644 --- a/indra/newview/llfloaterinventorythumbnailshelper.cpp +++ b/indra/newview/llfloaterinventorythumbnailshelper.cpp @@ -38,6 +38,7 @@ #include "llinventorymodel.h" #include "llinventoryfunctions.h" #include "lltexteditor.h" +#include "llscrolllistctrl.h" #include "llmediactrl.h" #include "lluuid.h" #include "llaisapi.h" @@ -66,6 +67,10 @@ BOOL LLFloaterInventoryThumbnailsHelper::postBuild() //mMergeItemsTexturesBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onMergeItemsTextures, this)); //mMergeItemsTexturesBtn->setEnabled(false); + mInventoryThumbnailsList = getChild<LLScrollListCtrl>("inventory_thumbnails_list"); + mInventoryThumbnailsList->setAllowMultipleSelection(true); + mInventoryThumbnailsList->deleteAllItems(); + mWriteThumbnailsBtn = getChild<LLUICtrl>("write_thumbnails_btn"); mWriteThumbnailsBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onWriteThumbnails, this)); mWriteThumbnailsBtn->setEnabled(false); @@ -91,6 +96,24 @@ void LLFloaterInventoryThumbnailsHelper::recordInventoryItemEntry(LLViewerInvent //id.asString() << std::endl ), false); + + // TODO: use this ID to get name of texture and display that + const LLUUID current_thumbnail_id = item->getThumbnailUUID(); + + std::string texture_display = std::string("Not Present"); + if (!current_thumbnail_id.isNull()) + { + texture_display = current_thumbnail_id.asString(); + } + + LLSD row; + row["columns"][0]["column"] = "name"; + row["columns"][0]["type"] = "text"; + row["columns"][0]["value"] = name; + row["columns"][1]["column"] = "texture"; + row["columns"][1]["type"] = "text"; + row["columns"][1]["value"] = texture_display; + mInventoryThumbnailsList->addElement(row); } else { @@ -238,6 +261,31 @@ void LLFloaterInventoryThumbnailsHelper::onPasteTextures() } mOutputLog->setCursorAndScrollToEnd(); + + populateThumbnailNames(); +} + + +void LLFloaterInventoryThumbnailsHelper::populateThumbnailNames() +{ + std::map<std::string, LLUUID>::iterator item_iter = mItemNamesIDs.begin(); + + while (item_iter != mItemNamesIDs.end()) + { + std::string item_name = (*item_iter).first; + + std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.find(item_name); + if (texture_iter != mTextureNamesIDs.end()) + { + const bool case_sensitive = true; + LLScrollListItem* entry = mInventoryThumbnailsList->getItemByLabel(item_name, case_sensitive); + + const std::string texture_name = (*texture_iter).first; + entry->getColumn(1)->setValue(LLSD(texture_name)); + } + + ++item_iter; + } } void LLFloaterInventoryThumbnailsHelper::mergeItemsTextures() diff --git a/indra/newview/llfloaterinventorythumbnailshelper.h b/indra/newview/llfloaterinventorythumbnailshelper.h index 3942214fe1..ec83d5b7e0 100644 --- a/indra/newview/llfloaterinventorythumbnailshelper.h +++ b/indra/newview/llfloaterinventorythumbnailshelper.h @@ -30,6 +30,7 @@ #include "llfloater.h" class LLTextEditor; +class LLScrollListCtrl; class LLMediaCtrl; class LLViewerInventoryItem; class LLUUID; @@ -43,6 +44,8 @@ class LLFloaterInventoryThumbnailsHelper: BOOL postBuild() override; ~LLFloaterInventoryThumbnailsHelper(); + LLScrollListCtrl* mInventoryThumbnailsList; + LLUICtrl* mPasteItemsBtn; void onPasteItems(); @@ -58,6 +61,7 @@ class LLFloaterInventoryThumbnailsHelper: void recordInventoryItemEntry(LLViewerInventoryItem* item); void recordTextureItemEntry(LLViewerInventoryItem* item); + void populateThumbnailNames(); std::map<std::string, LLUUID> mItemNamesIDs; std::map<std::string, LLUUID> mTextureNamesIDs; diff --git a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml index 62d0417f9e..512bce2475 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml @@ -13,12 +13,13 @@ <scroll_list top="20" height="350" + draw_stripes="true" draw_heading="true" follows="all" layout="topleft" left="8" multi_select="true" - name="inventory_thumbnails_textures_list" + name="inventory_thumbnails_list" right="-8" tool_tip="Paste items from your inventory"> <scroll_list.columns @@ -28,7 +29,7 @@ <scroll_list.columns dynamic_width="true" label="Texture Name" - name="expires" + name="texture" relative_width="0.6" /> </scroll_list> <text_editor |