From 7d9642210d83f1e791bcbf8b5ac70614e7040ef0 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sat, 20 Jul 2019 18:52:27 -0400
Subject: [PATCH] Close on select before selection callback, if desired

---
 indra/newview/llfloateravatarpicker.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index 50669c006..6c5e22775 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -257,16 +257,21 @@ void LLFloaterAvatarPicker::onBtnSelect()
 			uuid_vec_t			avatar_ids;
 			std::vector<LLAvatarName>	avatar_names;
 			getSelectedAvatarData(list, avatar_ids, avatar_names);
+			if (mCloseOnSelect) // Singu Note: Close before callback if we get here first, makes potential next dialog floater position correctly
+			{
+				mCloseOnSelect = FALSE;
+				close();
+			}
 			mSelectionCallback(avatar_ids, avatar_names);
 		}
 	}
 	getChild<LLScrollListCtrl>("SearchResults")->deselectAllItems(TRUE);
 	getChild<LLScrollListCtrl>("NearMe")->deselectAllItems(TRUE);
 	getChild<LLScrollListCtrl>("Friends")->deselectAllItems(TRUE);
-	if(mCloseOnSelect)
+	if (mCloseOnSelect)
 	{
 		mCloseOnSelect = FALSE;
-		close();		
+		close();
 	}
 }