summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMaxim Nikolenko <maximnproductengine@lindenlab.com>2023-05-19 18:09:35 +0300
committerMaxim Nikolenko <maximnproductengine@lindenlab.com>2023-05-19 18:09:35 +0300
commitd53c8a7d65cabaab303c21db7bb6d2ce4370c331 (patch)
tree4b9c879bddc651cf7ff693c77d9f42022dcb822a /indra/newview
parent100ace48f1cd64a364179c06900465209aac4945 (diff)
SL-19738 don't switch the view when creating an item
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorypanel.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index c5d3fa3f7a..604bffb96e 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1834,7 +1834,13 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
if (main_inventory && main_inventory->isSingleFolderMode()
&& use_main_panel)
{
- main_inventory->toggleViewMode();
+ const LLInventoryObject *obj = gInventory.getObject(obj_id);
+ if (obj)
+ {
+ main_inventory->setSingleFolderViewRoot(obj->getParentUUID(), false);
+ main_inventory->setGallerySelection(obj_id);
+ return;
+ }
}
LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open);