merge

--HG--
branch : product-engine

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 9fda77fe74..a402dfc3d1 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1876,6 +1876,17 @@ bool idle_startup()
 				LLViewerShaderMgr::instance()->setShaders();
 			}
 		}
+		
+		// If this is the very first time the user has logged into viewer2+ (from a legacy viewer, or new account)
+		// then auto-populate outfits from the library into the My Outfits folder.
+		static bool check_populate_my_outfits = true;
+		if (check_populate_my_outfits && 
+			(LLInventoryModel::getIsFirstTimeInViewer2() 
+			 || gSavedSettings.getBOOL("MyOutfitsAutofill")))
+		{
+			gAgentWearables.populateMyOutfitsFolder();
+		}
+		check_populate_my_outfits = false;
 
 		return TRUE;
 	}