diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-02-24 03:05:30 +0200 |
|---|---|---|
| committer | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-02-24 03:17:53 +0200 |
| commit | 49da5288bd0425241823186bfd56a159fe2f9a60 (patch) | |
| tree | da412dafd1c9be961f254f825737b9e026706c6b /indra/newview/llinventorypanel.cpp | |
| parent | a2c61cfe35cfe3edb6fcedc09e9529c9a2940ed0 (diff) | |
SL-19234 add Inventory settings floater
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 91fa856d5e..80d9b69937 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -183,7 +183,7 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) : mCommitCallbackRegistrar.add("Inventory.BeginIMSession", boost::bind(&LLInventoryPanel::beginIMSession, this)); mCommitCallbackRegistrar.add("Inventory.Share", boost::bind(&LLAvatarActions::shareWithAvatars, this)); mCommitCallbackRegistrar.add("Inventory.FileUploadLocation", boost::bind(&LLInventoryPanel::fileUploadLocation, this, _2)); - mCommitCallbackRegistrar.add("Inventory.OpenNewFolderWindow", boost::bind(&LLInventoryPanel::openSingleViewInventory, this, _2)); + mCommitCallbackRegistrar.add("Inventory.OpenNewFolderWindow", boost::bind(&LLInventoryPanel::openSingleViewInventory, this, LLUUID())); } LLFolderView * LLInventoryPanel::createFolderRoot(LLUUID root_id ) @@ -1644,9 +1644,9 @@ void LLInventoryPanel::fileUploadLocation(const LLSD& userdata) } } -void LLInventoryPanel::openSingleViewInventory(const LLSD& userdata) +void LLInventoryPanel::openSingleViewInventory(LLUUID folder_id) { - LLPanelMainInventory::newFolderWindow(LLFolderBridge::sSelf.get()->getUUID()); + LLPanelMainInventory::newFolderWindow(folder_id.isNull() ? LLFolderBridge::sSelf.get()->getUUID() : folder_id); } void LLInventoryPanel::purgeSelectedItems() |