From ae3fc753f910a15ca1c3dfa925be6a182eaf793c Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 6 Jul 2021 10:33:33 +0200
Subject: [PATCH] Revert "FIRE-31031 New Create Landmark Floater: Default to
 Landmarks Folder"

This reverts commit ca97cd9b147fb82e7de03cc00d693988b6b3b293.
---
 indra/newview/llfloatercreatelandmark.cpp | 26 +++++++++--------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/indra/newview/llfloatercreatelandmark.cpp b/indra/newview/llfloatercreatelandmark.cpp
index 8f2fdc4e89..eb93a6a75a 100644
--- a/indra/newview/llfloatercreatelandmark.cpp
+++ b/indra/newview/llfloatercreatelandmark.cpp
@@ -160,9 +160,16 @@ void LLFloaterCreateLandmark::populateFoldersList(const LLUUID &folder_id)
 	mFolderCombo->removeall();
 
 	// Put the "My Favorites" folder first in list.
-	// <FS:PP> Code moved below because of:
-	// FIRE-31031 New Create Landmark Floater: Default to Landmarks Folder
-	// </FS:PP>
+	LLUUID favorites_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
+	LLViewerInventoryCategory* favorites_cat = gInventory.getCategory(favorites_id);
+	if (!favorites_cat)
+	{
+		LL_WARNS() << "Cannot find the favorites folder" << LL_ENDL;
+	}
+	else
+	{
+		mFolderCombo->add(getString("favorites_bar"), favorites_cat->getUUID());
+	}
 
 	// Add the "Landmarks" category. 
 	const LLViewerInventoryCategory* lmcat = gInventory.getCategory(mLandmarksID);
@@ -176,19 +183,6 @@ void LLFloaterCreateLandmark::populateFoldersList(const LLUUID &folder_id)
 		mFolderCombo->add(cat_full_name, lmcat->getUUID());
 	}
 
-	// <FS:PP> FIRE-31031 New Create Landmark Floater: Default to Landmarks Folder
-	LLUUID favorites_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
-	LLViewerInventoryCategory* favorites_cat = gInventory.getCategory(favorites_id);
-	if (!favorites_cat)
-	{
-		LL_WARNS() << "Cannot find the favorites folder" << LL_ENDL;
-	}
-	else
-	{
-		mFolderCombo->add(getString("favorites_bar"), favorites_cat->getUUID());
-	}
-	// </FS:PP>
-
 	typedef std::vector<folder_pair_t> folder_vec_t;
 	folder_vec_t folders;
 	// Sort the folders by their full name.