diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-18 12:40:11 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-18 12:40:11 -0700 |
| commit | a04cdf5af27965d560dade1778fd3fbeaf88a912 (patch) | |
| tree | 91049b441d3e1efac03055678596ae366b173b8f /indra/newview/llpopupview.cpp | |
| parent | 73802de5d5d0a3b294e7187f7b00c302217aec72 (diff) | |
| parent | 3e2db3d3364e3bb146da9d94b25638bd9fd7de29 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpopupview.cpp')
| -rw-r--r-- | indra/newview/llpopupview.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/newview/llpopupview.cpp b/indra/newview/llpopupview.cpp index d8ad59c90c..b010f4d72f 100644 --- a/indra/newview/llpopupview.cpp +++ b/indra/newview/llpopupview.cpp @@ -207,11 +207,7 @@ void LLPopupView::addPopup(LLView* popup) { if (popup) { - popup_list_t::iterator iter = std::find(mPopups.begin(), mPopups.end(), popup->getHandle()); - if(iter != mPopups.end()) - { - mPopups.erase(iter); - } + mPopups.remove(popup->getHandle()); mPopups.push_front(popup->getHandle()); } } @@ -220,11 +216,7 @@ void LLPopupView::removePopup(LLView* popup) { if (popup) { - popup_list_t::iterator iter = std::find(mPopups.begin(), mPopups.end(), popup->getHandle()); - if(iter != mPopups.end()) - { - mPopups.erase(iter); - } + mPopups.remove(popup->getHandle()); popup->onTopLost(); } } |