From de71961b0d400d4989181ee7419942955a775741 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 20 Apr 2012 18:15:55 -0700
Subject: Adding new controls to the console for showing waterplane and world
 movables only.  Also, re-arranging the sorting of the check boxes.

---
 indra/newview/llfloaterpathfindingconsole.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llfloaterpathfindingconsole.h')

diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h
index b492444a7d..8c271d2352 100644
--- a/indra/newview/llfloaterpathfindingconsole.h
+++ b/indra/newview/llfloaterpathfindingconsole.h
@@ -80,6 +80,12 @@ public:
 	BOOL isRenderWorld() const;
 	void setRenderWorld(BOOL pIsRenderWorld);
 	
+	BOOL isRenderWorldMovablesOnly() const;
+	void setRenderWorldMovablesOnly(BOOL pIsRenderWorldMovablesOnly);
+
+	BOOL isRenderWaterPlane() const;
+	void setRenderWaterPlane(BOOL pIsRenderWaterPlane);
+	
 	BOOL isRenderXRay() const;
 	void setRenderXRay(BOOL pIsRenderXRay);
 	
@@ -108,6 +114,8 @@ private:
 	LLFloaterPathfindingConsole(const LLSD& pSeed);
 	virtual ~LLFloaterPathfindingConsole();
 
+	void onShowWorldSet();
+	void onShowNavMeshSet();
 	void onShowWalkabilitySet();
 	void onViewCharactersClicked();
 	void onTabSwitch();
@@ -124,6 +132,8 @@ private:
 
 	void setDefaultInputs();
 	void setConsoleState(EConsoleState pConsoleState);
+	void setWorldRenderState();
+	void setNavMeshRenderState();
 
 	void        updateControlsOnConsoleState();
 	void        updateStatusOnConsoleState();
@@ -147,6 +157,8 @@ private:
 
 	LLRootHandle<LLFloaterPathfindingConsole>     mSelfHandle;
 	LLTextBase                                    *mShowLabel;
+	LLCheckBoxCtrl                                *mShowWorldCheckBox;
+	LLCheckBoxCtrl                                *mShowWorldMovablesOnlyCheckBox;
 	LLCheckBoxCtrl                                *mShowNavMeshCheckBox;
 	LLTextBase                                    *mShowNavMeshWalkabilityLabel;
 	LLComboBox                                    *mShowNavMeshWalkabilityComboBox;
@@ -154,7 +166,7 @@ private:
 	LLCheckBoxCtrl                                *mShowStaticObstaclesCheckBox;
 	LLCheckBoxCtrl                                *mShowMaterialVolumesCheckBox;
 	LLCheckBoxCtrl                                *mShowExclusionVolumesCheckBox;
-	LLCheckBoxCtrl                                *mShowWorldCheckBox;
+	LLCheckBoxCtrl								  *mShowRenderWaterPlaneCheckBox;
 	LLCheckBoxCtrl								  *mShowXRayCheckBox;
 	LLTextBase                                    *mPathfindingViewerStatus;
 	LLTextBase                                    *mPathfindingSimulatorStatus;
-- 
cgit v1.2.3