diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 34 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml | 31 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 9 |
4 files changed, 1 insertions, 74 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 5da53cc928..9bfea7fe2b 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -1373,27 +1373,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata) return; const std::string command_name = userdata.asString(); - if (command_name == "new_single_folder_window") - { - newFolderWindow(); - } - if ((command_name == "open_in_current_window") || (command_name == "open_in_new_window")) - { - LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem(); - if (!current_item) - { - return; - } - const LLUUID& folder_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID(); - if((command_name == "open_in_current_window")) - { - mSingleFolderPanelInventory->changeFolderRoot(folder_id); - } - if((command_name == "open_in_new_window")) - { - newFolderWindow(folder_id); - } - } + if (command_name == "new_window") { newWindow(); @@ -1660,19 +1640,7 @@ bool LLPanelMainInventory::isActionVisible(const LLSD& userdata) { return !mSingleFolderMode; } - if (param_str == "open_folder" || param_str == "open_new_folder") - { - if (!mSingleFolderMode && (param_str == "open_folder")) return false; - - LLFolderView* root = getActivePanel()->getRootFolder(); - std::set<LLFolderViewItem*> selection_set = root->getSelectionList(); - if (selection_set.size() != 1) return false; - LLFolderViewItem* current_item = *selection_set.begin(); - if (!current_item) return false; - const LLUUID& folder_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID(); - return (gInventory.getCategory(folder_id) != NULL); - } return true; } diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 19930e0e03..015a887e9f 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -9703,7 +9703,6 @@ void initialize_menus() commit.add("PayObject", boost::bind(&handle_give_money_dialog)); commit.add("Inventory.NewWindow", boost::bind(&LLPanelMainInventory::newWindow)); - commit.add("Inventory.NewFolderWindow", boost::bind(&LLPanelMainInventory::newFolderWindow, LLUUID(), LLUUID())); enable.add("EnablePayObject", boost::bind(&enable_pay_object)); enable.add("EnablePayAvatar", boost::bind(&enable_pay_avatar)); diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml index f778742ed9..d2bd33a44c 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml @@ -7,37 +7,6 @@ name="menu_gear_default" visible="false"> <menu_item_call - label="Open" - layout="topleft" - name="open_in_current_window"> - <on_click - function="Inventory.GearDefault.Custom.Action" - parameter="open_in_current_window" /> - <on_visible - function="Inventory.GearDefault.Visible" - parameter="open_folder" /> - </menu_item_call> - <menu_item_call - label="Open in new window" - layout="topleft" - name="open_in_new_window"> - <on_click - function="Inventory.GearDefault.Custom.Action" - parameter="open_in_new_window" /> - <on_visible - function="Inventory.GearDefault.Visible" - parameter="open_new_folder" /> - </menu_item_call> - <menu_item_call - label="New Folder Window" - layout="topleft" - shortcut="control|shift|J" - name="new_single_folder"> - <on_click - function="Inventory.GearDefault.Custom.Action" - parameter="new_single_folder_window" /> - </menu_item_call> - <menu_item_call label="New Inventory Window" layout="topleft" shortcut="control|shift|I" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index de11a2c0e9..58584345a9 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -37,15 +37,6 @@ parameter="" /> </menu_item_call> <menu_item_call - label="New Folder Window" - name="new_single_folder" - shortcut="control|shift|J" - visible="false"> - <menu_item_call.on_click - function="Inventory.NewFolderWindow" - parameter="" /> - </menu_item_call> - <menu_item_call label="Places..." name="Places" shortcut="control|L"> |