diff options
| author | prep <prep@lindenlab.com> | 2012-06-19 10:40:03 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-06-19 10:40:03 -0400 |
| commit | 15d7f3867cc0e88258a032f6bd99daed73b1e135 (patch) | |
| tree | 68431a5c407ebd86014a829d21b3426dec686696 | |
| parent | c5db43d9a5094948c4e64032d88f218919db5b8b (diff) | |
Don't display the rebake navmesh button while SL splash screen is up
| -rw-r--r-- | indra/newview/llpathfindingmanager.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llstartup.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp index 674a96a439..209176fc0b 100644 --- a/indra/newview/llpathfindingmanager.cpp +++ b/indra/newview/llpathfindingmanager.cpp @@ -54,6 +54,7 @@ #include "llweb.h" #include "llpanelnavmeshrebake.h" #include "llenvmanager.h" +#include "llstartup.h" #define CAP_SERVICE_RETRIEVE_NAVMESH "RetrieveNavMeshSrc" @@ -835,7 +836,8 @@ void LLAgentStateChangeNode::post(ResponsePtr pResponse, const LLSD &pContext, c void LLPathfindingManager::handleAgentStateUpdate() { - displayNavMeshRebakePanel(); + //Don't trigger if we are still loading in + if ( LLStartUp::getStartupState() == STATE_STARTED) { displayNavMeshRebakePanel(); } } //--------------------------------------------------------------------------- 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; |