diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-02 14:56:12 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-02 14:56:12 -0400 |
| commit | cd4c44fe7a0873d6845c40440fccb5755ba02c9f (patch) | |
| tree | 97495552b197a1a03bb5d3c1033df2b5d5968004 | |
| parent | 695671d51e1bb7c1039fffa057d0477210aca308 (diff) | |
EXT-8198 Incorrect right-click options for library folders
Only adding "--no options--" when right-click context menu is empty. Normal priority bug but rather annoying visually.
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 96dba5717a..79a18115a7 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2617,11 +2617,6 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) gInventory.addObserver(fetch); } } - else - { - mItems.push_back(std::string("--no options--")); - mDisabledItems.push_back(std::string("--no options--")); - } // Preemptively disable system folder removal if more than one item selected. if ((flags & FIRST_SELECTED_ITEM) == 0) @@ -2635,6 +2630,12 @@ 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); } |