From 902548c55cce856633a74fe98f515ad4b1804c05 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 3 Mar 2010 20:58:00 -0800
Subject: nested popups close properly

---
 indra/newview/llpopupview.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpopupview.cpp b/indra/newview/llpopupview.cpp
index 3494522969..d9e4ebcd3c 100644
--- a/indra/newview/llpopupview.cpp
+++ b/indra/newview/llpopupview.cpp
@@ -117,8 +117,16 @@ BOOL LLPopupView::handleMouseEvent(boost::function<BOOL(LLView*, S32, S32)> func
 			}
 		}
 
-		popup->onTopLost();
-		mPopups.erase(popup_it++);
+		if (close_popups)
+		{
+			popup_list_t::iterator cur_popup_it = popup_it++;
+			mPopups.erase(cur_popup_it);
+			popup->onTopLost();
+		}
+		else
+		{
+			++popup_it;
+		}
 	}
 
 	return FALSE;
-- 
cgit v1.2.3