diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-01-05 15:10:39 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-01-05 15:10:39 -0500 |
commit | 7c7527b6727a6070fd7679ea28e4e2692452bf27 (patch) | |
tree | 149af6391cf0e751488964871e8bfcf62adbb160 /indra/newview/llinventorybridge.cpp | |
parent | df1c6d2a2e4ccfe7bd19a66ba95c4f7bc6edee5e (diff) | |
parent | e2f197b6f77592c84d0c2967cc0e8110c79f2f49 (diff) |
Automated merge up from viewer-development
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 968d1202c1..c50afb0e9d 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -5420,11 +5420,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); |