EXT-4544 : Take out favorites autopopulation code

Removed autopopulation code.  This has been in viewer2 for months but actually is buggy itself (i.e. didn't actually autopopulate new accounts most of the time) so it didn't manifest until recently.

1 files changed, 0 insertions, 59 deletions

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 88b4c34e2b..6b816f8786 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -307,59 +307,6 @@ void update_texture_fetch()
 	gTextureList.updateImages(0.10f);
 }
 
-//Copies landmarks from the "Library" to "My Favorites"
-void populate_favorites_bar()
-{
-	//*TODO consider extending LLInventoryModel::findCategoryUUIDForType(...) to support both root's
-	LLInventoryModel::cat_array_t* lib_cats = NULL;
-	LLInventoryModel::item_array_t* lib_items = NULL;
-	gInventory.getDirectDescendentsOf(gInventory.getLibraryRootFolderID(), lib_cats, lib_items);
-	if (!lib_cats) return;
-
-	LLUUID lib_landmarks(LLUUID::null);
-	S32 count = lib_cats->count();
-	for(S32 i = 0; i < count; ++i)
-	{
-		if(lib_cats->get(i)->getPreferredType() == LLFolderType::FT_LANDMARK)
-		{
-			lib_landmarks = lib_cats->get(i)->getUUID();
-			break;
-		}
-	}
-	if (lib_landmarks.isNull())
-	{
-		llerror("Library inventory is missing Landmarks", 0);
-		return;
-	}
-
-	LLInventoryModel::cat_array_t* lm_cats = NULL;
-	LLInventoryModel::item_array_t* lm_items = NULL;
-	gInventory.getDirectDescendentsOf(lib_landmarks, lm_cats, lm_items);
-	if (!lm_items) return;
-
-	const LLUUID favorites_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
-	if (favorites_id.isNull())
-	{
-		llerror("My Inventory is missing My Favorites", 0);
-		return;
-	}
-
-	S32 lm_count = lm_items->count();
-	for (S32 i = 0; i < lm_count; ++i)
-	{
-		LLInventoryItem* item = lm_items->get(i);
-		if (item->getUUID().isNull()) continue;
-
-		copy_inventory_item(gAgent.getID(),
-			item->getPermissions().getOwner(),
-			item->getUUID(),
-			favorites_id,
-			std::string(),
-			LLPointer<LLInventoryCallback>(NULL));
-	}
-}
-
-
 // Returns false to skip other idle processing. Should only return
 // true when all initialization done.
 bool idle_startup()
@@ -1705,12 +1652,6 @@ bool idle_startup()
 		llinfos << "Creating Inventory Views" << llendl;
 		LLFloaterReg::getInstance("inventory");
 
-		//default initial content for Favorites Bar 
-		if (gAgent.isFirstLogin())
-		{
-			populate_favorites_bar();
-		}
-
 		LLStartUp::setStartupState( STATE_MISC );
 		return FALSE;
 	}