Merge branch 'main' into release/maint-c

# Conflicts:
#	indra/llui/lltexteditor.cpp
#	indra/newview/llcontrolavatar.cpp

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/llpopupview.cpp b/indra/newview/llpopupview.cpp
index 353d261ad1..0b13fc37b9 100644
--- a/indra/newview/llpopupview.cpp
+++ b/indra/newview/llpopupview.cpp
@@ -256,16 +256,16 @@ void LLPopupView::removePopup(LLView* popup)
 
 void LLPopupView::clearPopups()
 {
-    for (popup_list_t::iterator popup_it = mPopups.begin();
-        popup_it != mPopups.end();)
+    while (!mPopups.empty())
     {
+        popup_list_t::iterator popup_it = mPopups.begin();
         LLView* popup = popup_it->get();
-
-        popup_list_t::iterator cur_popup_it = popup_it;
-        ++popup_it;
-
-        mPopups.erase(cur_popup_it);
-        popup->onTopLost();
+        // Remove before notifying in case it will cause removePopup
+        mPopups.erase(popup_it);
+        if (popup)
+        {
+            popup->onTopLost();
+        }
     }
 }