From 890ae756b4b694ee84d70813cbe166933876541a Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 8 Jun 2011 22:19:20 -0700
Subject: Re-enabled fetchinventoryonlogin setting and renamed it to
 fetchinventoryonlogin2 so it's enabled for users of previous versions

---
 linden/indra/newview/app_settings/settings.xml |  4 ++--
 linden/indra/newview/llstartup.cpp             | 22 ++++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e571988..57c2065 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -512,7 +512,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  <key>FetchInventoryOnLogin</key>
+  <key>FetchInventoryOnLogin2</key>
   	<map>
 		<key>Comment</key>
 		<string>Automatically fetch the inventory in the background after login (has issues)</string>
@@ -521,7 +521,7 @@
 		<key>Type</key>
 		<string>Boolean</string>
 		<key>Value</key>
-		<integer>0</integer>
+		<integer>1</integer>
   </map>
   <key>FloaterAnimationListRect</key>
   <map>
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 922cfa3..3b8215b 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2453,13 +2453,17 @@ bool idle_startup()
 		// start background fetching for animations here in case the cache is empty.
 		// We do this to improve AO support (that's Animatoni Overrider, not LL's
 		// silly "AO" acronym -- MC
-		if (gInventory.getAnimationsFolderUUID() != LLUUID::null)
+		if (gSavedSettings.getBOOL("FetchInventoryOnLogin2"))
 		{
-			gInventory.startBackgroundFetch(gInventory.getAnimationsFolderUUID());
-		}
-		else
-		{
-			gInventory.startBackgroundFetch();
+			// Start loading inventory
+			if (gInventory.getAnimationsFolderUUID() != LLUUID::null)
+			{
+				gInventory.startBackgroundFetch(gInventory.getAnimationsFolderUUID());
+			}
+			else
+			{
+				gInventory.startBackgroundFetch();
+			}
 		}
 
 		options.clear();
@@ -2948,12 +2952,6 @@ bool idle_startup()
 		// Have the agent start watching the friends list so we can update proxies
 		gAgent.observeFriends();
 
-		if (gSavedSettings.getBOOL("FetchInventoryOnLogin"))
-		{
-			// Start loading inventory
-			gInventory.startBackgroundFetch();
-		}
-
 		if (gSavedSettings.getBOOL("LoginAsGod"))
 		{
 			gAgent.requestEnterGodMode();
-- 
cgit v1.1