diff options
| author | Richard Nelson <none@none> | 2010-03-18 11:07:05 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-03-18 11:07:05 -0700 |
| commit | 37b188d92945a22f8b0c37c51c6151c122904131 (patch) | |
| tree | 286b4d903fe4ff095af0e846f845df2d53919f3d /indra/newview/llpopupview.cpp | |
| parent | 4abc086930b024888f088cfbbcaf841bf6a531dd (diff) | |
| parent | 20e496051062b1d919506b1ab60d28134eb2b68f (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..dcde1325bf 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(popuip->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(); } } |