diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
| commit | ef37311e9e47c26b370a61bb61361ed60f8d878a (patch) | |
| tree | ea4cb7c83d7ea5e0b328ea3595fd87942bd17c89 /indra/newview/llpanelpathfindingrebakenavmesh.cpp | |
| parent | 42cc602732824df9af239de3b5d7ba05b5797106 (diff) | |
| parent | 8df36196215131cbac961f47bfbd4a1b925548cb (diff) | |
merge up to latest viewer-pathfinding (including 3.3.4)
Diffstat (limited to 'indra/newview/llpanelpathfindingrebakenavmesh.cpp')
| -rw-r--r-- | indra/newview/llpanelpathfindingrebakenavmesh.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpanelpathfindingrebakenavmesh.cpp b/indra/newview/llpanelpathfindingrebakenavmesh.cpp index 8df041f578..7efb1a9227 100644 --- a/indra/newview/llpanelpathfindingrebakenavmesh.cpp +++ b/indra/newview/llpanelpathfindingrebakenavmesh.cpp @@ -45,7 +45,6 @@ #include "lltoolbar.h" #include "lltoolbarview.h" #include "lltooltip.h" -#include "llviewercontrol.h" #include "llviewerregion.h" LLPanelPathfindingRebakeNavmesh* LLPanelPathfindingRebakeNavmesh::getInstance() @@ -239,7 +238,7 @@ void LLPanelPathfindingRebakeNavmesh::createNavMeshStatusListenerForCurrentRegio bool LLPanelPathfindingRebakeNavmesh::doDraw() const { - return ((mCanRebakeRegion || gSavedSettings.getBOOL("PathfindingEnableAlwaysAllowRebakeNavMesh")) && (mRebakeNavMeshMode != kRebakeNavMesh_NotAvailable)); + return (mCanRebakeRegion && (mRebakeNavMeshMode != kRebakeNavMesh_NotAvailable)); } void LLPanelPathfindingRebakeNavmesh::updatePosition() |