diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-25 20:15:51 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-25 20:15:51 -0400 |
| commit | 0a56031bd3e3645a9e5124a722cece0706469944 (patch) | |
| tree | 39e2244564d2b71d8277231f691160807f8c10b9 /indra/newview/llpopupview.cpp | |
| parent | 885fc3f9b54cca33e134bcfb65c1d2a9c0aeec7a (diff) | |
| parent | fad31dc087cb670bd4479195cac2c31da9a55e57 (diff) | |
automated 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(); } } |