diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:55:55 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:55:55 -0500 |
commit | d034d8d9289a9e5511d32ec048b75837b89264ad (patch) | |
tree | c3fd25eb7d1096baef0290b5bf86321f7ed447ad /indra/newview/llinventorybridge.cpp | |
parent | 6150e4ed7cf86a2afc0061ba89b0cb049d6f036e (diff) | |
parent | 97a9211d87fac90994846e5bf91a78a708ec5a9c (diff) |
merge changes for vwr-24347
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index ab0acbae50..5108f68592 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -5344,11 +5344,6 @@ void LLRecentItemsFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) menuentry_vec_t disabled_items, items = getMenuItems(); - items.erase(std::remove(items.begin(), items.end(), std::string("New Body Parts")), items.end()); - items.erase(std::remove(items.begin(), items.end(), std::string("New Clothes")), items.end()); - items.erase(std::remove(items.begin(), items.end(), std::string("New Note")), items.end()); - items.erase(std::remove(items.begin(), items.end(), std::string("New Gesture")), items.end()); - items.erase(std::remove(items.begin(), items.end(), std::string("New Script")), items.end()); items.erase(std::remove(items.begin(), items.end(), std::string("New Folder")), items.end()); hide_context_entries(menu, items, disabled_items); |