summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmaininventory.cpp
diff options
context:
space:
mode:
authorMaxim Nikolenko <maximnproductengine@lindenlab.com>2023-02-27 20:27:11 +0200
committerMaxim Nikolenko <maximnproductengine@lindenlab.com>2023-02-27 20:27:11 +0200
commitf377e27f0b8ddabf755c6efe71d6bc0e53e751c1 (patch)
tree0bf40c271aa905a3bf8b50a96421df8b9a57aae9 /indra/newview/llpanelmaininventory.cpp
parentcb7debd70dc880a9cdeef983dc99281780c5e89a (diff)
SL-19274 Add new double-click option to Inventory settings
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
-rw-r--r--indra/newview/llpanelmaininventory.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 0fd4eb0c15..5da53cc928 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1321,10 +1321,13 @@ void LLPanelMainInventory::onForwardFolderClicked()
mSingleFolderPanelInventory->onForwardFolder();
}
-void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id)
+void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id, bool clear_nav_history)
{
mSingleFolderPanelInventory->changeFolderRoot(folder_id);
- mSingleFolderPanelInventory->clearNavigationHistory();
+ if(clear_nav_history)
+ {
+ mSingleFolderPanelInventory->clearNavigationHistory();
+ }
}
void LLPanelMainInventory::showActionMenu(LLMenuGL* menu, std::string spawning_view_name)