From e61785a45f7ad1ace4937423f421ea1f0b956e23 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 12 Jul 2012 14:29:11 -0700
Subject: Removing debug settings that were in place for pathfinding simulator
 testing.

---
 indra/newview/app_settings/settings.xml           | 33 -----------------------
 indra/newview/llfloaterpathfindingconsole.cpp     |  1 +
 indra/newview/llpanelpathfindingrebakenavmesh.cpp |  3 +--
 indra/newview/llviewerobject.h                    |  5 ++--
 4 files changed, 4 insertions(+), 38 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0f3ae89fa8..f57a63cd03 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13886,39 +13886,6 @@
     <real>2.3</real>
   </map>
 
-  <key>PathfindingDisablePermanentObjects</key>
-  <map>
-    <key>Comment</key>
-    <string>Disables the viewer from seeing the permanent object flag.  Useful for testing server-side enforcement of permanent object rules.</string>
-    <key>Persist</key>
-    <integer>0</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
-  <key>PathfindingDisableCharacterObjects</key>
-  <map>
-    <key>Comment</key>
-    <string>Disables the viewer from seeing the character object flag.  Useful for testing server-side enforcement of character object rules.</string>
-    <key>Persist</key>
-    <integer>0</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
-  <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>
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 2fe60a8d8f..298454724b 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -53,6 +53,7 @@
 #include "lltextbase.h"
 #include "lltoolmgr.h"
 #include "lltoolfocus.h"
+#include "llviewercontrol.h"
 #include "llviewerparcelmgr.h"
 #include "pipeline.h"
 
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()
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index d63ab1e10d..df09f1b640 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -45,7 +45,6 @@
 #include "llvertexbuffer.h"
 #include "llbbox.h"
 #include "llbbox.h"
-#include "llviewercontrol.h"
 
 class LLAgent;			// TODO: Get rid of this.
 class LLAudioSource;
@@ -477,8 +476,8 @@ public:
 	inline BOOL		flagObjectCopy() const			{ return ((mFlags & FLAGS_OBJECT_COPY) != 0); }
 	inline BOOL		flagObjectMove() const			{ return ((mFlags & FLAGS_OBJECT_MOVE) != 0); }
 	inline BOOL		flagObjectTransfer() const		{ return ((mFlags & FLAGS_OBJECT_TRANSFER) != 0); }
-	inline BOOL		flagObjectPermanent() const		{ return gSavedSettings.getBOOL("PathfindingDisablePermanentObjects") ? FALSE : ((mFlags & FLAGS_AFFECTS_NAVMESH) != 0); }
-	inline BOOL		flagCharacter() const			{ return gSavedSettings.getBOOL("PathfindingDisableCharacterObjects") ? FALSE : ((mFlags & FLAGS_CHARACTER) != 0); }
+	inline BOOL		flagObjectPermanent() const		{ return ((mFlags & FLAGS_AFFECTS_NAVMESH) != 0); }
+	inline BOOL		flagCharacter() const			{ return ((mFlags & FLAGS_CHARACTER) != 0); }
 	inline BOOL		flagVolumeDetect() const		{ return ((mFlags & FLAGS_VOLUME_DETECT) != 0); }
 	inline BOOL		flagIncludeInSearch() const     { return ((mFlags & FLAGS_INCLUDE_IN_SEARCH) != 0); }
 	inline BOOL		flagScripted() const			{ return ((mFlags & FLAGS_SCRIPTED) != 0); }
-- 
cgit v1.2.3