diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-15 16:21:35 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-15 16:21:35 -0800 |
| commit | f1edfc73efa526735b2a80d47e2381a2b46295df (patch) | |
| tree | 7fd47b670df58fa21c196889d5d640603ca2424e /indra/newview | |
| parent | b6af1b47f15992b60ddb4c718f03ae6d2040cc19 (diff) | |
EXP-1726 FIX -- Rename option present in context menu when selecting multiple folders in Outbox
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 64b5a9deba..adf1d6254d 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2933,10 +2933,15 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) { mItems.push_back(std::string("Rename")); mItems.push_back(std::string("Delete")); + + if ((flags & FIRST_SELECTED_ITEM) == 0) + { + mDisabledItems.push_back(std::string("Rename")); + } } else if(isAgentInventory()) // do not allow creating in library { - LLViewerInventoryCategory *cat = getCategory(); + LLViewerInventoryCategory *cat = getCategory(); // BAP removed protected check to re-enable standard ops in untyped folders. // Not sure what the right thing is to do here. if (!isCOFFolder() && cat && (cat->getPreferredType() != LLFolderType::FT_OUTFIT)) |