diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-19 02:17:01 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-19 02:17:01 +0000 |
| commit | ea1bfae838c59e24ec1a962f7d015d609b63d083 (patch) | |
| tree | 4fb1bc94522313df13a6d329cd8fef29d099a46d /indra/newview/llplacesinventorybridge.cpp | |
| parent | 8103710c054ec6ea4a46f9732e569e543691184b (diff) | |
Merging revisions 2070-2084 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-792 EXT-1519 EXT-1514 EXT-1245 EXT-1600 EXT-1535 EXT-1174 EXT-1241
* Dev: EXT-1271 EXT-1601 EXT-1154
Diffstat (limited to 'indra/newview/llplacesinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llplacesinventorybridge.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/indra/newview/llplacesinventorybridge.cpp b/indra/newview/llplacesinventorybridge.cpp index ef02882c0d..b3b4857727 100644 --- a/indra/newview/llplacesinventorybridge.cpp +++ b/indra/newview/llplacesinventorybridge.cpp @@ -79,13 +79,8 @@ void LLPlacesLandmarkBridge::buildContextMenu(LLMenuGL& menu, U32 flags) { fill_items_with_menu_items(items, menu); - // Disable "Landmark More Information" menu item for - // multiple landmarks selected. Only one landmark - // info panel can be shown at a time. - if ((flags & FIRST_SELECTED_ITEM) == 0) - { - disabled_items.push_back(std::string("more_info")); - } + // Disabled items are processed via LLLandmarksPanel::isActionEnabled() + // they should be synchronized with Places/My Landmarks/Gear menu. See EXT-1601 } hideContextEntries(menu, items, disabled_items); @@ -101,13 +96,10 @@ void LLPlacesFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) LLInventoryPanel* inv_panel = dynamic_cast<LLInventoryPanel*>(mInventoryPanel.get()); bool is_open = false; - bool disable_changing = true; if (inv_panel) { LLFolderViewFolder* folder = dynamic_cast<LLFolderViewFolder*>(inv_panel->getRootFolder()->getItemByID(mUUID)); is_open = (NULL != folder) && folder->isOpen(); - - disable_changing = !is_landmarks_panel(inv_panel); } // collect all items' names @@ -118,12 +110,8 @@ void LLPlacesFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) std::vector<std::string>::iterator it = std::find(items.begin(), items.end(), collapse_expand_item_to_hide); if (it != items.end()) items.erase(it); - if (disable_changing) - { - disabled_items.push_back(std::string("add_folder")); - disabled_items.push_back(std::string("rename")); - disabled_items.push_back(std::string("delete")); - } + // Disabled items are processed via LLLandmarksPanel::isActionEnabled() + // they should be synchronized with Places/My Landmarks/Gear menu. See EXT-1601 // repeat parent functionality sSelf = this; // necessary for "New Folder" functionality |