diff options
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index db88ca0b9b..f7b7a6635e 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -413,23 +413,30 @@ void LLInvFVBridge::showProperties() } } -void LLInvFVBridge::navigateToFolder() +void LLInvFVBridge::navigateToFolder(bool new_window) { - LLInventorySingleFolderPanel* panel = dynamic_cast<LLInventorySingleFolderPanel*>(mInventoryPanel.get()); - if (!panel) - { - return; - } - LLInventoryModel* model = getInventoryModel(); - if (!model) + if(new_window) { - return; + mInventoryPanel.get()->openSingleViewInventory(mUUID); } - if (mUUID.isNull()) + else { - return; + LLInventorySingleFolderPanel* panel = dynamic_cast<LLInventorySingleFolderPanel*>(mInventoryPanel.get()); + if (!panel) + { + return; + } + LLInventoryModel* model = getInventoryModel(); + if (!model) + { + return; + } + if (mUUID.isNull()) + { + return; + } + panel->changeFolderRoot(mUUID); } - panel->changeFolderRoot(mUUID); } void LLInvFVBridge::removeBatch(std::vector<LLFolderViewModelItem*>& batch) |