summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorgabriel lee <gabriel@lindenlab.com>2010-06-16 18:03:03 +0100
committergabriel lee <gabriel@lindenlab.com>2010-06-16 18:03:03 +0100
commit42a4ab9ae1d72c479a8958ea9e4e8b75db9cc68c (patch)
treec4e0ecb08b6c59ff34aa477fa207af2744957b62 /indra
parent9ee5a62332353db6a098628e69732d2723cc5deb (diff)
EXT-7834 fixed corruption of menu item vectors
reviewed by Richard
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llinventorybridge.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 413f329ce9..ec367c1746 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -5184,12 +5184,12 @@ void LLRecentItemsFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
menuentry_vec_t disabled_items, items = getMenuItems();
- items.erase(std::find(items.begin(), items.end(), std::string("New Folder")));
- items.erase(std::find(items.begin(), items.end(), std::string("New Script")));
- items.erase(std::find(items.begin(), items.end(), std::string("New Note")));
- items.erase(std::find(items.begin(), items.end(), std::string("New Gesture")));
- items.erase(std::find(items.begin(), items.end(), std::string("New Clothes")));
- items.erase(std::find(items.begin(), items.end(), std::string("New Body Parts")));
+ 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);
}