2 files changed, 14 insertions, 5 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index dbadad7056..fb1395712f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13829,7 +13829,18 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
- <key>PathfindingWaterColor</key>
+  <key>PathfindingEnableAlwaysAllowRebakeNavMesh</key>
+  <map>
+    <key>Comment</key>
+    <string>Always allows the rebake navmesh button to appear on dirty regions, regardless of whether the user has permissions.</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>PathfindingWaterColor</key>
     <map>
       <key>Comment</key>
       <string>yay!</string>
@@ -13845,7 +13856,5 @@
         <real>1.0</real>
       </array>
     </map>
-  
-
 </map>
 </llsd>
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()