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

"Show original" doesn't show item if it's in the inbox folder and the inbox folder isn't shown in normal inventory

meow-7.2.2
Ansariel 2018-06-01 20:44:17 +02:00
parent da317b6f7b
commit 73038685a2
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llinventoryfunctions.cpp
View File

@ -873,7 +873,25 @@ void show_item_original(const LLUUID& item_uuid)
main_inventory->showAllItemsPanel();
main_inventory->resetFilters();
main_inventory->onFilterEdit("");
main_inventory->getActivePanel()->setSelection(gInventory.getLinkedItemID(item_uuid), TAKE_FOCUS_YES);
LLUUID linked_item_id = gInventory.getLinkedItemID(item_uuid);
bool in_inbox = (gInventory.isObjectDescendentOf(linked_item_id, gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX)));
bool show_inbox = gSavedSettings.getBOOL("FSShowInboxFolder"); // <FS:Ansariel> Optional hiding of Received Items folder aka Inbox
if (in_inbox && !show_inbox)
{
LLInventoryPanel * inventory_panel = NULL;
sidepanel_inventory->openInbox();
inventory_panel = sidepanel_inventory->getInboxPanel();
if (inventory_panel)
{
inventory_panel->setSelection(linked_item_id, TAKE_FOCUS_YES);
}
}
else
{
main_inventory->getActivePanel()->setSelection(linked_item_id, TAKE_FOCUS_YES);
}
// </FS:Ansariel>
}