diff options
author | Merov Linden <merov@lindenlab.com> | 2013-01-20 14:16:53 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-01-20 14:16:53 -0800 |
commit | 52018b79bdd715dbb7bd42792447566347b641d5 (patch) | |
tree | 15a98c58a296f04ac25dff0d49315556afcee6ed | |
parent | 5eef65e99476b716985eeccfbbcdafdfb664cb1a (diff) |
CHUI-379 : Fix Mac and Linux build failures
-rw-r--r-- | indra/llui/llmenugl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 2ea25648df..27f6ac5b80 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -2471,13 +2471,13 @@ void LLMenuGL::erase( S32 begin, S32 end, bool arrange/* = true*/) return; } - item_list_t::const_iterator start_position = mItems.begin(); + item_list_t::iterator start_position = mItems.begin(); std::advance(start_position, begin); - item_list_t::const_iterator end_position = mItems.begin(); + item_list_t::iterator end_position = mItems.begin(); std::advance(end_position, end); - for (item_list_t::const_iterator position_iter = start_position; position_iter != end_position; position_iter++) + for (item_list_t::iterator position_iter = start_position; position_iter != end_position; position_iter++) { LLUICtrl::removeChild(*position_iter); } @@ -2500,7 +2500,7 @@ void LLMenuGL::insert( S32 position, LLView * ctrl, bool arrange /*= true*/ ) return; } - item_list_t::const_iterator position_iter = mItems.begin(); + item_list_t::iterator position_iter = mItems.begin(); std::advance(position_iter, position); mItems.insert(position_iter, item); LLUICtrl::addChild(item); |