From 0916f45254fd4cc240295884b2000edb74fed629 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 29 Nov 2021 14:30:42 +0100
Subject: [PATCH] FIRE-24125: Better close the current floater last in case of
 unexpected results when closing it while still iterating over the list of
 floaters

---
 indra/llui/llfloater.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 14a7eb562b..2b894c09f6 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1996,10 +1996,11 @@ void LLFloater::onClickCloseBtn(bool app_quitting)
 		auto floaterlist = LLFloaterReg::getAllFloatersInGroup(this);
 		for (auto floater : floaterlist)
 		{
-			floater->closeFloater();
+			if (floater != this)
+			{
+				floater->closeFloater();
+			}
 		}
-
-		return;
 	}
 	// </FS:Ansariel>