1 files changed, 5 insertions, 2 deletions

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"))
                 {