summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelnavmeshrebake.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelnavmeshrebake.cpp')
-rw-r--r--indra/newview/llpanelnavmeshrebake.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelnavmeshrebake.cpp b/indra/newview/llpanelnavmeshrebake.cpp
index b12c970da3..0536cad6a7 100644
--- a/indra/newview/llpanelnavmeshrebake.cpp
+++ b/indra/newview/llpanelnavmeshrebake.cpp
@@ -46,6 +46,7 @@
#include "lltoolmgr.h"
#include "lltooltip.h"
#include "llview.h"
+#include "llviewercontrol.h"
#include "llviewerregion.h"
LLPanelNavMeshRebake* LLPanelNavMeshRebake::getInstance()
@@ -147,7 +148,6 @@ void LLPanelNavMeshRebake::onNavMeshRebakeClick()
void LLPanelNavMeshRebake::handleAgentState(BOOL pCanRebakeRegion)
{
- llinfos << "STINSON DEBUG: canRebakeRegion => " << (pCanRebakeRegion ? "TRUE" : "FALSE") << llendl;
mCanRebakeRegion = pCanRebakeRegion;
}
@@ -205,7 +205,7 @@ void LLPanelNavMeshRebake::createNavMeshStatusListenerForCurrentRegion()
bool LLPanelNavMeshRebake::doDraw() const
{
- return (mCanRebakeRegion && (mRebakeNavMeshMode != kRebakeNavMesh_NotAvailable));
+ return ((mCanRebakeRegion || gSavedSettings.getBOOL("PathfindingEnableAlwaysAllowRebakeNavMesh")) && (mRebakeNavMeshMode != kRebakeNavMesh_NotAvailable));
}
void LLPanelNavMeshRebake::updatePosition()