PATH-500: Updating the pathfinding console defaults following the integration of the xray code.

3 files changed, 23 insertions, 12 deletions

diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index d0e047d48b..0c44399840 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -195,6 +195,7 @@ void LLFloaterPathfindingConsole::onOpen(const LLSD& pKey)
 	}

 

 	setAgentState(LLPathfindingManager::getInstance()->getAgentState());

+	setDefaultInputs();

 	updatePathTestStatus();

 }

 

@@ -220,16 +221,10 @@ void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting)
 		mNavMeshZone.disable();

 	}

 

-	LLFloater::onClose(pIsAppQuitting);

+	setDefaultInputs();

 	setConsoleState(kConsoleStateUnknown);

-	//Reset all the checkboxes to default

-	mShowNavMeshCheckBox->set( false );

-	mShowWalkablesCheckBox->set( false );

-	mShowMaterialVolumesCheckBox->set(  false );

-	mShowStaticObstaclesCheckBox->set( false );

-	mShowExclusionVolumesCheckBox->set( false );

-	mShowWorldCheckBox->set( false );	

-	mShowXRayCheckBox->set(false);

+

+	LLFloater::onClose(pIsAppQuitting);

 }

 

 BOOL LLFloaterPathfindingConsole::handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down)

@@ -361,7 +356,6 @@ void LLFloaterPathfindingConsole::setRenderXRay(BOOL pIsRenderXRay)
 	mShowXRayCheckBox->set(pIsRenderXRay);

 }

 

-

 LLFloaterPathfindingConsole::ERenderHeatmapType LLFloaterPathfindingConsole::getRenderHeatmapType() const

 {

 	ERenderHeatmapType renderHeatmapType;

@@ -532,6 +526,7 @@ LLFloaterPathfindingConsole::LLFloaterPathfindingConsole(const LLSD& pSeed)
 	mShowMaterialVolumesCheckBox(NULL),

 	mShowExclusionVolumesCheckBox(NULL),

 	mShowWorldCheckBox(NULL),

+	mShowXRayCheckBox(NULL),

 	mPathfindingViewerStatus(NULL),

 	mPathfindingSimulatorStatus(NULL),

 	mViewCharactersButton(NULL),

@@ -707,6 +702,18 @@ void LLFloaterPathfindingConsole::onRegionBoundaryCross()
 	initializeNavMeshZoneForCurrentRegion();

 }

 

+void LLFloaterPathfindingConsole::setDefaultInputs()

+{

+	mEditTestTabContainer->selectTab(0);

+	mShowNavMeshCheckBox->set(FALSE);

+	mShowWalkablesCheckBox->set(FALSE);

+	mShowMaterialVolumesCheckBox->set(FALSE);

+	mShowStaticObstaclesCheckBox->set(FALSE);

+	mShowExclusionVolumesCheckBox->set(FALSE);

+	mShowWorldCheckBox->set(TRUE);	

+	mShowXRayCheckBox->set(FALSE);

+}

+

 void LLFloaterPathfindingConsole::setConsoleState(EConsoleState pConsoleState)

 {

 	mConsoleState = pConsoleState;

@@ -728,6 +735,7 @@ void LLFloaterPathfindingConsole::updateControlsOnConsoleState()
 		mShowMaterialVolumesCheckBox->setEnabled(FALSE);

 		mShowExclusionVolumesCheckBox->setEnabled(FALSE);

 		mShowWorldCheckBox->setEnabled(FALSE);

+		mShowXRayCheckBox->setEnabled(FALSE);

 		mViewCharactersButton->setEnabled(FALSE);

 		mEditTestTabContainer->selectTab(0);

 		mTestTab->setEnabled(FALSE);

@@ -747,6 +755,7 @@ void LLFloaterPathfindingConsole::updateControlsOnConsoleState()
 		mShowMaterialVolumesCheckBox->setEnabled(FALSE);

 		mShowExclusionVolumesCheckBox->setEnabled(FALSE);

 		mShowWorldCheckBox->setEnabled(FALSE);

+		mShowXRayCheckBox->setEnabled(FALSE);

 		mViewCharactersButton->setEnabled(TRUE);

 		mEditTestTabContainer->selectTab(0);

 		mTestTab->setEnabled(FALSE);

@@ -764,6 +773,7 @@ void LLFloaterPathfindingConsole::updateControlsOnConsoleState()
 		mShowMaterialVolumesCheckBox->setEnabled(TRUE);

 		mShowExclusionVolumesCheckBox->setEnabled(TRUE);

 		mShowWorldCheckBox->setEnabled(TRUE);

+		mShowXRayCheckBox->setEnabled(TRUE);

 		mViewCharactersButton->setEnabled(TRUE);

 		mTestTab->setEnabled(TRUE);

 		mCharacterWidthSlider->setEnabled(TRUE);

diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h
index c810119958..2bec5399f5 100644
--- a/indra/newview/llfloaterpathfindingconsole.h
+++ b/indra/newview/llfloaterpathfindingconsole.h
@@ -149,6 +149,7 @@ private:
 	void onAgentStateCB(LLPathfindingManager::EAgentState pAgentState);

 	void onRegionBoundaryCross();

 

+	void setDefaultInputs();

 	void setConsoleState(EConsoleState pConsoleState);

 

 	void        updateControlsOnConsoleState();

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index d1bd1a02da..707b06c643 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -271,7 +271,7 @@
       layout="topleft"
       left="230"
       top="35"
-      height="344"
+      height="366"
       width="214"
       visible="true" />
   <tab_container
@@ -281,7 +281,7 @@
       name="edit_test_tab_container"
       left="227"
       top="14"
-      height="366"
+      height="388"
       width="218">
     <panel
         border="false"