summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-07-26 17:53:48 -0400
committerLoren Shih <seraph@lindenlab.com>2010-07-26 17:53:48 -0400
commit4a361046f32a685408ddbc1e4a3138946c448ff1 (patch)
treee9fd02273346a23eea02728069bc576d5a0874a8 /indra/newview/llinventorybridge.cpp
parent6ad892aa95b50a4bbcd369657d47d428ee248f96 (diff)
EXT-8229 FIXED Add "--no options--" automatically instead of special casing for it in right-click menus
Changed logic so that the menu is post-processed and, at that time, nooptions is added if the menu is seen to be empty.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 0b1408616e..f2a91defef 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2612,12 +2612,6 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
mDisabledItems.push_back(std::string("Share"));
}
- if (mItems.empty())
- {
- mItems.push_back(std::string("--no options--"));
- mDisabledItems.push_back(std::string("--no options--"));
- }
-
hide_context_entries(menu, mItems, mDisabledItems);
// Add menu items that are dependent on the contents of the folder.