diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 3c1e58205a..8b439449c5 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -925,7 +925,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, addDeleteContextMenuOptions(items, disabled_items); } - if (!isPanelActive("All Items") && !isPanelActive("single_folder_inv") && !isPanelActive("comb_single_folder_inv")) + if (!isPanelActive("All Items") && !isPanelActive("comb_single_folder_inv")) { items.push_back(std::string("Show in Main Panel")); } @@ -4419,7 +4419,7 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags, menuentry_vec_t& { items.push_back(std::string("open_in_new_window")); items.push_back(std::string("Open Folder Separator")); - if(isPanelActive("single_folder_inv")) + if(isPanelActive("comb_single_folder_inv")) { items.push_back(std::string("open_in_current_window")); } diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index e133bd37a1..7259ecf788 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -1503,9 +1503,10 @@ void LLPanelMainInventory::onAddButtonClick() void LLPanelMainInventory::setActivePanel() { + // Todo: should cover gallery mode in some way if(mSingleFolderMode && isListViewMode()) { - mActivePanel = getChild<LLInventoryPanel>("single_folder_inv"); + mActivePanel = getChild<LLInventoryPanel>("comb_single_folder_inv"); } else if(mSingleFolderMode && isCombinationViewMode()) { |