summaryrefslogtreecommitdiff
path: root/indra/newview/llpathfindingmanager.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2012-06-19 10:40:03 -0400
committerprep <prep@lindenlab.com>2012-06-19 10:40:03 -0400
commit15d7f3867cc0e88258a032f6bd99daed73b1e135 (patch)
tree68431a5c407ebd86014a829d21b3426dec686696 /indra/newview/llpathfindingmanager.cpp
parentc5db43d9a5094948c4e64032d88f218919db5b8b (diff)
Don't display the rebake navmesh button while SL splash screen is up
Diffstat (limited to 'indra/newview/llpathfindingmanager.cpp')
-rw-r--r--indra/newview/llpathfindingmanager.cpp4
1 files changed, 3 insertions, 1 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(); }
}
//---------------------------------------------------------------------------