Commits

Stinson Linden  committed f155d31

Removing debug settings that were in place for pathfinding simulator testing.

  • Participants
  • Parent commits bd99666

Comments (0)

Files changed (4)

File indra/newview/app_settings/settings.xml

     <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>

File indra/newview/llfloaterpathfindingconsole.cpp

 #include "lltextbase.h"
 #include "lltoolmgr.h"
 #include "lltoolfocus.h"
+#include "llviewercontrol.h"
 #include "llviewerparcelmgr.h"
 #include "pipeline.h"
 

File indra/newview/llpanelpathfindingrebakenavmesh.cpp

 #include "lltoolbar.h"
 #include "lltoolbarview.h"
 #include "lltooltip.h"
-#include "llviewercontrol.h"
 #include "llviewerregion.h"
 
 LLPanelPathfindingRebakeNavmesh* LLPanelPathfindingRebakeNavmesh::getInstance()
 
 bool LLPanelPathfindingRebakeNavmesh::doDraw() const
 {
-	return ((mCanRebakeRegion || gSavedSettings.getBOOL("PathfindingEnableAlwaysAllowRebakeNavMesh")) && (mRebakeNavMeshMode != kRebakeNavMesh_NotAvailable));
+	return (mCanRebakeRegion && (mRebakeNavMeshMode != kRebakeNavMesh_NotAvailable));
 }
 
 void LLPanelPathfindingRebakeNavmesh::updatePosition()

File indra/newview/llviewerobject.h

 #include "llvertexbuffer.h"
 #include "llbbox.h"
 #include "llbbox.h"
-#include "llviewercontrol.h"
 
 class LLAgent;			// TODO: Get rid of this.
 class LLAudioSource;
 	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); }