From 15d7f3867cc0e88258a032f6bd99daed73b1e135 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Tue, 19 Jun 2012 10:40:03 -0400
Subject: Don't display the rebake navmesh button while SL splash screen is up

---
 indra/newview/llstartup.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llstartup.cpp')

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index fd6f6e14d3..3b8be3cc4f 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1969,9 +1969,6 @@ bool idle_startup()
 			}
 		}
 
-		llassert(LLPathfindingManager::getInstance() != NULL);
-		LLPathfindingManager::getInstance()->initSystem();
-
 		display_startup();
         //DEV-17797.  get null folder.  Any items found here moved to Lost and Found
         LLInventoryModelBackgroundFetch::instance().findLostItems();
@@ -2169,6 +2166,8 @@ bool idle_startup()
 		LLIMFloater::initIMFloater();
 		display_startup();
 
+		llassert(LLPathfindingManager::getInstance() != NULL);
+		LLPathfindingManager::getInstance()->initSystem();
 		LLPathfindingManager::getInstance()->requestGetAgentState();
 
 		return TRUE;
-- 
cgit v1.2.3