livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-19712 Folders and items shouldn't be both called items

master
Andrey Kleshchev 2023-05-12 19:17:31 +03:00
parent 6e2e9d5904
commit b4d0aeee37
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterchangeitemthumbnail.cpp
View File

@ -335,6 +335,7 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj)
LLViewerInventoryItem* item = dynamic_cast<LLViewerInventoryItem*>(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))

8
indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
View File

@ -8,6 +8,14 @@
title="CHANGE ITEM IMAGE"
width="319">
<floater.string
name="title_item_thumbnail">
CHANGE ITEM IMAGE
</floater.string>
<floater.string
name="title_folder_thumbnail">
CHANGE FOLDER IMAGE
</floater.string>
<floater.string
name="tooltip_upload_local">
Upload from computer