From b4d0aeee37973525589223842e149caa28dea2af Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 12 May 2023 19:17:31 +0300 Subject: SL-19712 Folders and items shouldn't be both called items --- indra/newview/llfloaterchangeitemthumbnail.cpp | 2 ++ .../skins/default/xui/en/floater_change_item_thumbnail.xml | 8 ++++++++ 2 files changed, 10 insertions(+) (limited to 'indra') diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp index 4249ae9305..3070c437bd 100644 --- a/indra/newview/llfloaterchangeitemthumbnail.cpp +++ b/indra/newview/llfloaterchangeitemthumbnail.cpp @@ -335,6 +335,7 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj) LLViewerInventoryItem* item = dynamic_cast(obj); if (item) { + setTitle(getString("title_item_thumbnail")); // This floater probably shouldn't be possible to open // for imcomplete items llassert(item->isFinished()); @@ -348,6 +349,7 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj) if (cat) { + setTitle(getString("title_folder_thumbnail")); icon_img = LLUI::getUIImage(LLViewerFolderType::lookupIconName(cat->getPreferredType(), true)); if (thumbnail_id.isNull() && (cat->getPreferredType() == LLFolderType::FT_OUTFIT)) diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml index f3f8ee0daa..ec2961b0f3 100644 --- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml +++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml @@ -8,6 +8,14 @@ title="CHANGE ITEM IMAGE" width="319"> + + CHANGE ITEM IMAGE + + + CHANGE FOLDER IMAGE + Upload from computer -- cgit v1.2.3