diff --git a/indra/newview/llfloatercreatelandmark.cpp b/indra/newview/llfloatercreatelandmark.cpp index 6b1d9306fb..588f72e85b 100644 --- a/indra/newview/llfloatercreatelandmark.cpp +++ b/indra/newview/llfloatercreatelandmark.cpp @@ -160,16 +160,9 @@ void LLFloaterCreateLandmark::populateFoldersList(const LLUUID &folder_id) mFolderCombo->removeall(); // Put the "My Favorites" folder first in list. - 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()); - } + // Code moved below because of: + // FIRE-31031 New Create Landmark Floater: Default to Landmarks Folder + // // Add the "Landmarks" category. const LLViewerInventoryCategory* lmcat = gInventory.getCategory(mLandmarksID); @@ -183,6 +176,19 @@ void LLFloaterCreateLandmark::populateFoldersList(const LLUUID &folder_id) mFolderCombo->add(cat_full_name, lmcat->getUUID()); } + // 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()); + } + // + typedef std::vector folder_vec_t; folder_vec_t folders; // Sort the folders by their full name.