2 files changed, 21 insertions, 2 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 3be4ed4..8c280d4 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4,6 +4,8 @@
   
   <!-- Imprudence-specific settings -->
 
+  <!-- begin name highlighting -->
+  
   <key>nick01</key>
   <map>
     <key>Comment</key>
@@ -102,6 +104,9 @@
       <real>1</real>
     </array>
   </map>
+
+  <!-- end name highlighting -->
+
   <key>AllowMUpose</key>
   <map>
     <key>Comment</key>
@@ -289,6 +294,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>FetchInventoryOnLogin</key>
+        <map>
+                <key>Comment</key>
+                <string>Automatically fetch the inventory in the background after login (has issues)</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Boolean</string>
+                <key>Value</key>
+                <integer>0</integer>
+  </map>
   <key>FloaterAnimationListRect</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index e997e5f..08d6d3f 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2788,8 +2788,11 @@ bool idle_startup()
                 // Have the agent start watching the friends list so we can update proxies
                 gAgent.observeFriends();
 
-                // Start loading inventory
-                gInventory.startBackgroundFetch();
+                if (gSavedSettings.getBOOL("FetchInventoryOnLogin"))
+                {
+                        // Start loading inventory
+                        gInventory.startBackgroundFetch();
+                }
 
                 if (gSavedSettings.getBOOL("LoginAsGod"))
                 {