diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:32:01 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:32:01 -0500 |
commit | 94fbf99ac2e325a75a016e2f4c3b12cf8c82fc7c (patch) | |
tree | 0f1aa2cbd03f47adf17f39e6bca8e7d5e4ac165c /indra/newview/llinventorybridge.cpp | |
parent | f1fd558dddf43277e024cb918c371d94d0764910 (diff) | |
parent | a9686db3e606ec45d23265fd34a1a35498f39857 (diff) |
merge changes for storm-714
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); |