From 24f857c0eee78243549690b8659b09ec27cae872 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 10 May 2011 14:41:08 -0700
Subject: Fixed inventory not background fetching on startup when inventory
 window was open on quit

---
 linden/indra/newview/llstartup.cpp | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index a2ed9fc..922cfa3 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2588,19 +2588,6 @@ bool idle_startup()
 		llinfos << "Requesting Agent Data" << llendl;
 		gAgent.sendAgentDataUpdateRequest();
 
-		bool shown_at_exit = gSavedSettings.getBOOL("ShowInventory");
-
-		// Create the inventory views
-		llinfos << "Creating Inventory Views" << llendl;
-		LLInventoryView::showAgentInventory();
-		llinfos << "Inventory Views Created" << llendl;
-
-		// Hide the inventory if it wasn't shown at exit
-		if(!shown_at_exit)
-		{
-			LLInventoryView::toggleVisibility(NULL);
-		}
-
 // [RLVa:KB] - Checked: 2009-11-27 (RLVa-1.1.0f) | Added: RLVa-1.1.0f
 		if (rlv_handler_t::isEnabled())
 		{
@@ -2991,6 +2978,17 @@ bool idle_startup()
 		// Clean up the userauth stuff.
 		LLUserAuth::getInstance()->reset();
 
+		// Show the inventory if it was shown at exit
+		// Don't do this before here or we screw up inv loading -- MC
+		if (gSavedSettings.getBOOL("ShowInventory"))
+		{
+			// Create the inventory views
+			llinfos << "Creating Inventory Views" << llendl;
+			LLInventoryView::showAgentInventory();
+			llinfos << "Inventory Views Created" << llendl;
+			//LLInventoryView::toggleVisibility(NULL);
+		}
+
 		LLStartUp::setStartupState( STATE_STARTED );
 		LLStartUp::setStartedOnce(true);
 		LLStartUp::setLoginFailed(false);
-- 
cgit v1.1