diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:33:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:33:35 -0500 |
| commit | 894e98a708f4135cb4543b95ce46c2b8c4929393 (patch) | |
| tree | 2055d289ca6c55eacb300feddb38b2935e8ae132 /indra/newview/llinventorybridge.cpp | |
| parent | 1ca028cd7b2b4a169cdc776dfa4b38b2fcb76440 (diff) | |
| parent | 94fbf99ac2e325a75a016e2f4c3b12cf8c82fc7c (diff) | |
merge changes for storm-812
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); |
