livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't display the rebake navmesh button while SL splash screen is up

meow-7.2.2
prep 2012-06-19 10:40:03 -04:00
parent c5db43d9a5
commit 15d7f3867c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llpathfindingmanager.cpp
View File

@ -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(); }
}
//---------------------------------------------------------------------------

5
indra/newview/llstartup.cpp
View File

@ -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;