From 20e496051062b1d919506b1ab60d28134eb2b68f Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Thu, 18 Mar 2010 11:06:48 -0700 Subject: EXT-6347 - Crash when clicking on member's section of Oskar Linden Fanclub reviewed by Callum --- indra/newview/llpopupview.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'indra/newview/llpopupview.cpp') 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(); } } -- cgit v1.2.3 From 3e2db3d3364e3bb146da9d94b25638bd9fd7de29 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 18 Mar 2010 11:44:13 -0700 Subject: oops, type right before commit :( --- indra/newview/llpopupview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpopupview.cpp') diff --git a/indra/newview/llpopupview.cpp b/indra/newview/llpopupview.cpp index dcde1325bf..b010f4d72f 100644 --- a/indra/newview/llpopupview.cpp +++ b/indra/newview/llpopupview.cpp @@ -207,7 +207,7 @@ void LLPopupView::addPopup(LLView* popup) { if (popup) { - mPopups.remove(popuip->getHandle()); + mPopups.remove(popup->getHandle()); mPopups.push_front(popup->getHandle()); } } -- cgit v1.2.3