PATH-284: Updating the class names in preparation for the new pathfinding console design.

7 files changed, 77 insertions, 77 deletions

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 4ff6b6f37d..e8454f6dad 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -155,15 +155,15 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="people"
            />
-  <command name="pathfinding_setup"
+  <command name="pathfinding_console"
            available_in_toybox="false"
            icon="Command_Pathfinding_Icon"
            label_ref="Command_Pathfinding_Label"
            tooltip_ref="Command_Pathfinding_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
-           execute_parameters="pathfinding_setup"
+           execute_parameters="pathfinding_console"
            is_running_function="Floater.IsOpen"
-           is_running_parameters="pathfinding_setup"
+           is_running_parameters="pathfinding_console"
            />
   <command name="pathfinding_characters"
            available_in_toybox="false"
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 35f56a5625..51952d87b5 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -1,5 +1,5 @@
 /** 
-* @file llfloaterpathfindingsetup.cpp
+* @file llfloaterpathfindingconsole.cpp
 * @author William Todd Stinson
 * @brief "Pathfinding console" floater, allowing manipulation of the Havok AI pathfinding settings.
 *
@@ -57,74 +57,74 @@
 const int CURRENT_REGION = 99;
 const int MAX_OBSERVERS = 10;
 //---------------------------------------------------------------------------
-// LLFloaterPathfindingSetup
+// LLFloaterPathfindingConsole
 //---------------------------------------------------------------------------
 
-BOOL LLFloaterPathfindingSetup::postBuild()
+BOOL LLFloaterPathfindingConsole::postBuild()
 {
-	childSetAction("view_and_edit_linksets", boost::bind(&LLFloaterPathfindingSetup::onViewEditLinksetClicked, this));
-	childSetAction("rebuild_navmesh", boost::bind(&LLFloaterPathfindingSetup::onRebuildNavMeshClicked, this));
-	childSetAction("refresh_navmesh", boost::bind(&LLFloaterPathfindingSetup::onRefreshNavMeshClicked, this));
+	childSetAction("view_and_edit_linksets", boost::bind(&LLFloaterPathfindingConsole::onViewEditLinksetClicked, this));
+	childSetAction("rebuild_navmesh", boost::bind(&LLFloaterPathfindingConsole::onRebuildNavMeshClicked, this));
+	childSetAction("refresh_navmesh", boost::bind(&LLFloaterPathfindingConsole::onRefreshNavMeshClicked, this));
 
 	mShowNavMeshCheckBox = findChild<LLCheckBoxCtrl>("show_navmesh_overlay");
 	llassert(mShowNavMeshCheckBox != NULL);
-	mShowNavMeshCheckBox->setCommitCallback(boost::bind(&LLFloaterPathfindingSetup::onShowNavMeshToggle, this));
+	mShowNavMeshCheckBox->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onShowNavMeshToggle, this));
 
 	mShowExcludeVolumesCheckBox = findChild<LLCheckBoxCtrl>("show_exclusion_volumes");
 	llassert(mShowExcludeVolumesCheckBox != NULL);
-	mShowExcludeVolumesCheckBox->setCommitCallback(boost::bind(&LLFloaterPathfindingSetup::onShowExcludeVolumesToggle, this));
+	mShowExcludeVolumesCheckBox->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onShowExcludeVolumesToggle, this));
 
 	mShowPathCheckBox = findChild<LLCheckBoxCtrl>("show_path");
 	llassert(mShowPathCheckBox != NULL);
-	mShowPathCheckBox->setCommitCallback(boost::bind(&LLFloaterPathfindingSetup::onShowPathToggle, this));
+	mShowPathCheckBox->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onShowPathToggle, this));
 
 	mShowWaterPlaneCheckBox = findChild<LLCheckBoxCtrl>("show_water_plane");
 	llassert(mShowWaterPlaneCheckBox != NULL);
-	mShowWaterPlaneCheckBox->setCommitCallback(boost::bind(&LLFloaterPathfindingSetup::onShowWaterPlaneToggle, this));
+	mShowWaterPlaneCheckBox->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onShowWaterPlaneToggle, this));
 
 	mRegionOverlayDisplayRadioGroup = findChild<LLRadioGroup>("region_overlay_display");
 	llassert(mRegionOverlayDisplayRadioGroup != NULL);
-	mRegionOverlayDisplayRadioGroup->setCommitCallback(boost::bind(&LLFloaterPathfindingSetup::onRegionOverlayDisplaySwitch, this));
+	mRegionOverlayDisplayRadioGroup->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onRegionOverlayDisplaySwitch, this));
 
 	mPathSelectionRadioGroup = findChild<LLRadioGroup>("path_selection");
 	llassert(mPathSelectionRadioGroup  != NULL);
-	mPathSelectionRadioGroup ->setCommitCallback(boost::bind(&LLFloaterPathfindingSetup::onPathSelectionSwitch, this));
+	mPathSelectionRadioGroup ->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onPathSelectionSwitch, this));
 
 	mCharacterWidthSlider = findChild<LLSliderCtrl>("character_width");
 	llassert(mCharacterWidthSlider != NULL);
-	mCharacterWidthSlider->setCommitCallback(boost::bind(&LLFloaterPathfindingSetup::onCharacterWidthSet, this));
+	mCharacterWidthSlider->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onCharacterWidthSet, this));
 
 	mCharacterTypeRadioGroup = findChild<LLRadioGroup>("character_type");
 	llassert(mCharacterTypeRadioGroup  != NULL);
-	mCharacterTypeRadioGroup->setCommitCallback(boost::bind(&LLFloaterPathfindingSetup::onCharacterTypeSwitch, this));
+	mCharacterTypeRadioGroup->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onCharacterTypeSwitch, this));
 
 	mPathfindingStatus = findChild<LLTextBase>("pathfinding_status");
 	llassert(mPathfindingStatus != NULL);
 
 	mTerrainMaterialA = findChild<LLLineEditor>("terrain_material_a");
 	llassert(mTerrainMaterialA != NULL);
-	mTerrainMaterialA->setCommitCallback(boost::bind(&LLFloaterPathfindingSetup::onTerrainMaterialASet, this));
+	mTerrainMaterialA->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onTerrainMaterialASet, this));
 	mTerrainMaterialA->setPrevalidate(LLTextValidate::validateFloat);
 
 	mTerrainMaterialB = findChild<LLLineEditor>("terrain_material_b");
 	llassert(mTerrainMaterialB != NULL);
-	mTerrainMaterialB->setCommitCallback(boost::bind(&LLFloaterPathfindingSetup::onTerrainMaterialBSet, this));
+	mTerrainMaterialB->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onTerrainMaterialBSet, this));
 	mTerrainMaterialB->setPrevalidate(LLTextValidate::validateFloat);
 
 	mTerrainMaterialC = findChild<LLLineEditor>("terrain_material_c");
 	llassert(mTerrainMaterialC != NULL);
-	mTerrainMaterialC->setCommitCallback(boost::bind(&LLFloaterPathfindingSetup::onTerrainMaterialCSet, this));
+	mTerrainMaterialC->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onTerrainMaterialCSet, this));
 	mTerrainMaterialC->setPrevalidate(LLTextValidate::validateFloat);
 
 	mTerrainMaterialD = findChild<LLLineEditor>("terrain_material_d");
 	llassert(mTerrainMaterialD != NULL);
-	mTerrainMaterialD->setCommitCallback(boost::bind(&LLFloaterPathfindingSetup::onTerrainMaterialDSet, this));
+	mTerrainMaterialD->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onTerrainMaterialDSet, this));
 	mTerrainMaterialD->setPrevalidate(LLTextValidate::validateFloat);
 
 	return LLFloater::postBuild();
 }
 
-LLFloaterPathfindingSetup::ERegionOverlayDisplay LLFloaterPathfindingSetup::getRegionOverlayDisplay() const
+LLFloaterPathfindingConsole::ERegionOverlayDisplay LLFloaterPathfindingConsole::getRegionOverlayDisplay() const
 {
 	ERegionOverlayDisplay regionOverlayDisplay;
 	switch (mRegionOverlayDisplayRadioGroup->getValue().asInteger())
@@ -144,7 +144,7 @@ LLFloaterPathfindingSetup::ERegionOverlayDisplay LLFloaterPathfindingSetup::getR
 	return regionOverlayDisplay;
 }
 
-void LLFloaterPathfindingSetup::setRegionOverlayDisplay(ERegionOverlayDisplay pRegionOverlayDisplay)
+void LLFloaterPathfindingConsole::setRegionOverlayDisplay(ERegionOverlayDisplay pRegionOverlayDisplay)
 {
 	LLSD radioGroupValue;
 
@@ -165,7 +165,7 @@ void LLFloaterPathfindingSetup::setRegionOverlayDisplay(ERegionOverlayDisplay pR
 	mRegionOverlayDisplayRadioGroup->setValue(radioGroupValue);
 }
 
-LLFloaterPathfindingSetup::EPathSelectionState LLFloaterPathfindingSetup::getPathSelectionState() const
+LLFloaterPathfindingConsole::EPathSelectionState LLFloaterPathfindingConsole::getPathSelectionState() const
 {
 	EPathSelectionState pathSelectionState;
 
@@ -185,7 +185,7 @@ LLFloaterPathfindingSetup::EPathSelectionState LLFloaterPathfindingSetup::getPat
 	return pathSelectionState;
 }
 
-void LLFloaterPathfindingSetup::setPathSelectionState(EPathSelectionState pPathSelectionState)
+void LLFloaterPathfindingConsole::setPathSelectionState(EPathSelectionState pPathSelectionState)
 {
 	LLSD radioGroupValue;
 
@@ -205,17 +205,17 @@ void LLFloaterPathfindingSetup::setPathSelectionState(EPathSelectionState pPathS
 	mPathSelectionRadioGroup->setValue(radioGroupValue);
 }
 
-F32 LLFloaterPathfindingSetup::getCharacterWidth() const
+F32 LLFloaterPathfindingConsole::getCharacterWidth() const
 {
 	return mCharacterWidthSlider->getValueF32();
 }
 
-void LLFloaterPathfindingSetup::setCharacterWidth(F32 pCharacterWidth)
+void LLFloaterPathfindingConsole::setCharacterWidth(F32 pCharacterWidth)
 {
 	mCharacterWidthSlider->setValue(LLSD(pCharacterWidth));
 }
 
-LLFloaterPathfindingSetup::ECharacterType LLFloaterPathfindingSetup::getCharacterType() const
+LLFloaterPathfindingConsole::ECharacterType LLFloaterPathfindingConsole::getCharacterType() const
 {
 	ECharacterType characterType;
 
@@ -242,7 +242,7 @@ LLFloaterPathfindingSetup::ECharacterType LLFloaterPathfindingSetup::getCharacte
 	return characterType;
 }
 
-void LLFloaterPathfindingSetup::setCharacterType(ECharacterType pCharacterType)
+void LLFloaterPathfindingConsole::setCharacterType(ECharacterType pCharacterType)
 {
 	LLSD radioGroupValue;
 
@@ -269,47 +269,47 @@ void LLFloaterPathfindingSetup::setCharacterType(ECharacterType pCharacterType)
 	mCharacterTypeRadioGroup->setValue(radioGroupValue);
 }
 
-F32 LLFloaterPathfindingSetup::getTerrainMaterialA() const
+F32 LLFloaterPathfindingConsole::getTerrainMaterialA() const
 {
 	return mTerrainMaterialA->getValue().asReal();
 }
 
-void LLFloaterPathfindingSetup::setTerrainMaterialA(F32 pTerrainMaterial)
+void LLFloaterPathfindingConsole::setTerrainMaterialA(F32 pTerrainMaterial)
 {
 	mTerrainMaterialA->setValue(LLSD(pTerrainMaterial));
 }
 
-F32 LLFloaterPathfindingSetup::getTerrainMaterialB() const
+F32 LLFloaterPathfindingConsole::getTerrainMaterialB() const
 {
 	return mTerrainMaterialB->getValue().asReal();
 }
 
-void LLFloaterPathfindingSetup::setTerrainMaterialB(F32 pTerrainMaterial)
+void LLFloaterPathfindingConsole::setTerrainMaterialB(F32 pTerrainMaterial)
 {
 	mTerrainMaterialB->setValue(LLSD(pTerrainMaterial));
 }
 
-F32 LLFloaterPathfindingSetup::getTerrainMaterialC() const
+F32 LLFloaterPathfindingConsole::getTerrainMaterialC() const
 {
 	return mTerrainMaterialC->getValue().asReal();
 }
 
-void LLFloaterPathfindingSetup::setTerrainMaterialC(F32 pTerrainMaterial)
+void LLFloaterPathfindingConsole::setTerrainMaterialC(F32 pTerrainMaterial)
 {
 	mTerrainMaterialC->setValue(LLSD(pTerrainMaterial));
 }
 
-F32 LLFloaterPathfindingSetup::getTerrainMaterialD() const
+F32 LLFloaterPathfindingConsole::getTerrainMaterialD() const
 {
 	return mTerrainMaterialD->getValue().asReal();
 }
 
-void LLFloaterPathfindingSetup::setTerrainMaterialD(F32 pTerrainMaterial)
+void LLFloaterPathfindingConsole::setTerrainMaterialD(F32 pTerrainMaterial)
 {
 	mTerrainMaterialD->setValue(LLSD(pTerrainMaterial));
 }
 
-void LLFloaterPathfindingSetup::setHasNavMeshReceived()
+void LLFloaterPathfindingConsole::setHasNavMeshReceived()
 {
 	std::string str = getString("navmesh_fetch_complete_available");
 	mPathfindingStatus->setText((LLStringExplicit)str);
@@ -321,13 +321,13 @@ void LLFloaterPathfindingSetup::setHasNavMeshReceived()
 	}
 }
 
-void LLFloaterPathfindingSetup::setHasNoNavMesh()
+void LLFloaterPathfindingConsole::setHasNoNavMesh()
 {
 	std::string str = getString("navmesh_fetch_complete_none");
 	mPathfindingStatus->setText((LLStringExplicit)str);
 }
 
-LLFloaterPathfindingSetup::LLFloaterPathfindingSetup(const LLSD& pSeed)
+LLFloaterPathfindingConsole::LLFloaterPathfindingConsole(const LLSD& pSeed)
 	: LLFloater(pSeed),
 	mShowNavMeshCheckBox(NULL),
 	mShowExcludeVolumesCheckBox(NULL),
@@ -352,11 +352,11 @@ LLFloaterPathfindingSetup::LLFloaterPathfindingSetup(const LLSD& pSeed)
 	}
 }
 
-LLFloaterPathfindingSetup::~LLFloaterPathfindingSetup()
+LLFloaterPathfindingConsole::~LLFloaterPathfindingConsole()
 {
 }
 
-void LLFloaterPathfindingSetup::onOpen(const LLSD& pKey)
+void LLFloaterPathfindingConsole::onOpen(const LLSD& pKey)
 {
 	//make sure we have a pathing system
 	if ( !LLPathingLib::getInstance() )
@@ -426,7 +426,7 @@ void LLFloaterPathfindingSetup::onOpen(const LLSD& pKey)
 	}		
 }
 
-void LLFloaterPathfindingSetup::onShowNavMeshToggle()
+void LLFloaterPathfindingConsole::onShowNavMeshToggle()
 {
 	BOOL checkBoxValue = mShowNavMeshCheckBox->get();
 
@@ -442,7 +442,7 @@ void LLFloaterPathfindingSetup::onShowNavMeshToggle()
 	}
 }
 
-void LLFloaterPathfindingSetup::onShowExcludeVolumesToggle()
+void LLFloaterPathfindingConsole::onShowExcludeVolumesToggle()
 {
 	BOOL checkBoxValue = mShowExcludeVolumesCheckBox->get();
 
@@ -458,7 +458,7 @@ void LLFloaterPathfindingSetup::onShowExcludeVolumesToggle()
 	}
 }
 
-void LLFloaterPathfindingSetup::onShowPathToggle()
+void LLFloaterPathfindingConsole::onShowPathToggle()
 {
 	BOOL checkBoxValue = mShowPathCheckBox->get();
 
@@ -474,7 +474,7 @@ void LLFloaterPathfindingSetup::onShowPathToggle()
 	}
 }
 
-void LLFloaterPathfindingSetup::onShowWaterPlaneToggle()
+void LLFloaterPathfindingConsole::onShowWaterPlaneToggle()
 {
 	BOOL checkBoxValue = mShowWaterPlaneCheckBox->get();
 
@@ -494,7 +494,7 @@ void LLFloaterPathfindingSetup::onShowWaterPlaneToggle()
 		<< (checkBoxValue ? "ON" : "OFF") << llendl;
 }
 
-void LLFloaterPathfindingSetup::onRegionOverlayDisplaySwitch()
+void LLFloaterPathfindingConsole::onRegionOverlayDisplaySwitch()
 {
 	LLPathingLib *llPathingLibInstance = LLPathingLib::getInstance();
 	if (llPathingLibInstance != NULL)
@@ -520,7 +520,7 @@ void LLFloaterPathfindingSetup::onRegionOverlayDisplaySwitch()
 	}
 }
 
-void LLFloaterPathfindingSetup::onPathSelectionSwitch()
+void LLFloaterPathfindingConsole::onPathSelectionSwitch()
 {
 	switch (getPathSelectionState())
 	{
@@ -536,12 +536,12 @@ void LLFloaterPathfindingSetup::onPathSelectionSwitch()
 	}
 }
 
-void LLFloaterPathfindingSetup::onCharacterWidthSet()
+void LLFloaterPathfindingConsole::onCharacterWidthSet()
 {
 	generatePath();
 }
 
-void LLFloaterPathfindingSetup::onCharacterTypeSwitch()
+void LLFloaterPathfindingConsole::onCharacterTypeSwitch()
 {
 	switch (getCharacterType())
 	{
@@ -572,43 +572,43 @@ void LLFloaterPathfindingSetup::onCharacterTypeSwitch()
 
 }
 
-void LLFloaterPathfindingSetup::onViewEditLinksetClicked()
+void LLFloaterPathfindingConsole::onViewEditLinksetClicked()
 {
 	LLFloaterPathfindingLinksets::openLinksetsEditor();
 }
 
-void LLFloaterPathfindingSetup::onRebuildNavMeshClicked()
+void LLFloaterPathfindingConsole::onRebuildNavMeshClicked()
 {
 	llwarns << "functionality has not yet been implemented to handle rebuilding of the navmesh" << llendl;
 }
 
-void LLFloaterPathfindingSetup::onRefreshNavMeshClicked()
+void LLFloaterPathfindingConsole::onRefreshNavMeshClicked()
 {
 	llwarns << "functionality has not yet been implemented to handle refreshing of the navmesh" << llendl;
 }
 
-void LLFloaterPathfindingSetup::onTerrainMaterialASet()
+void LLFloaterPathfindingConsole::onTerrainMaterialASet()
 {
 	F32 terrainMaterial = getTerrainMaterialA();
 	llwarns << "functionality has not yet been implemented to setting '" << mTerrainMaterialA->getName()
 		<< "' to value (" << terrainMaterial << ")" << llendl;
 }
 
-void LLFloaterPathfindingSetup::onTerrainMaterialBSet()
+void LLFloaterPathfindingConsole::onTerrainMaterialBSet()
 {
 	F32 terrainMaterial = getTerrainMaterialB();
 	llwarns << "functionality has not yet been implemented to setting '" << mTerrainMaterialB->getName()
 		<< "' to value (" << terrainMaterial << ")" << llendl;
 }
 
-void LLFloaterPathfindingSetup::onTerrainMaterialCSet()
+void LLFloaterPathfindingConsole::onTerrainMaterialCSet()
 {
 	F32 terrainMaterial = getTerrainMaterialC();
 	llwarns << "functionality has not yet been implemented to setting '" << mTerrainMaterialC->getName()
 		<< "' to value (" << terrainMaterial << ")" << llendl;
 }
 
-void LLFloaterPathfindingSetup::onTerrainMaterialDSet()
+void LLFloaterPathfindingConsole::onTerrainMaterialDSet()
 {
 	F32 terrainMaterial = getTerrainMaterialD();
 	llwarns << "functionality has not yet been implemented to setting '" << mTerrainMaterialD->getName()
@@ -616,7 +616,7 @@ void LLFloaterPathfindingSetup::onTerrainMaterialDSet()
 }
 
 
-void LLFloaterPathfindingSetup::providePathingData( const LLVector3& point1, const LLVector3& point2 )
+void LLFloaterPathfindingConsole::providePathingData( const LLVector3& point1, const LLVector3& point2 )
 {
 	switch (getPathSelectionState())
 	{
@@ -643,7 +643,7 @@ void LLFloaterPathfindingSetup::providePathingData( const LLVector3& point1, con
 	generatePath();
 }
 
-void LLFloaterPathfindingSetup::generatePath()
+void LLFloaterPathfindingConsole::generatePath()
 {
 	if (mHasStartPoint && mHasEndPoint)
 	{
diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h
index edb7072b28..f62fd9742b 100644
--- a/indra/newview/llfloaterpathfindingconsole.h
+++ b/indra/newview/llfloaterpathfindingconsole.h
@@ -1,5 +1,5 @@
 /** 
- * @file llfloaterpathfindingsetup.h
+ * @file llfloaterpathfindingconsole.h
  * @author William Todd Stinson
  * @brief "Pathfinding console" floater, allowing manipulation of the Havok AI pathfinding settings.
  *
@@ -25,8 +25,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLFLOATERPATHFINDINGSETUP_H
-#define LL_LLFLOATERPATHFINDINGSETUP_H
+#ifndef LL_LLFLOATERPATHFINDINGCONSOLE_H
+#define LL_LLFLOATERPATHFINDINGCONSOLE_H
 
 #include "llfloater.h"
 #include "llnavmeshstation.h"
@@ -39,7 +39,7 @@ class LLLineEditor;
 class LLTextBase;
 class LLCheckBoxCtrl;
 
-class LLFloaterPathfindingSetup
+class LLFloaterPathfindingConsole
 :	public LLFloater
 {
 	friend class LLFloaterReg;
@@ -102,8 +102,8 @@ protected:
 private:
 	// Does its own instance management, so clients not allowed
 	// to allocate or destroy.
-	LLFloaterPathfindingSetup(const LLSD& pSeed);
-	virtual ~LLFloaterPathfindingSetup();
+	LLFloaterPathfindingConsole(const LLSD& pSeed);
+	virtual ~LLFloaterPathfindingConsole();
 
 	virtual void onOpen(const LLSD& pKey);
 
@@ -148,4 +148,4 @@ private:
 	bool mHasEndPoint;
 };
 
-#endif // LL_LLFLOATERPATHFINDINGSETUP_H
+#endif // LL_LLFLOATERPATHFINDINGCONSOLE_H
diff --git a/indra/newview/llnavmeshstation.h b/indra/newview/llnavmeshstation.h
index 0aa714dac8..72bf725688 100644
--- a/indra/newview/llnavmeshstation.h
+++ b/indra/newview/llnavmeshstation.h
@@ -31,7 +31,7 @@
 #include "llhandle.h"
 //===============================================================================
 class LLCurlRequest;
-class LLFloaterPathfindingSetup;
+class LLFloaterPathfindingConsole;
 //===============================================================================
 class LLNavMeshObserver
 {
@@ -44,12 +44,12 @@ public:
 	virtual ~LLNavMeshObserver() {}
 	//Accessor for the observers handle
 	const LLHandle<LLNavMeshObserver>& getObserverHandle() const { return mObserverHandle; }
-	LLFloaterPathfindingSetup *getPathfindingConsole() {return mPathfindingConsole;}
-	void                        setPathfindingConsole(LLFloaterPathfindingSetup *pPathfindingConsole) {mPathfindingConsole = pPathfindingConsole;}
+	LLFloaterPathfindingConsole *getPathfindingConsole() {return mPathfindingConsole;}
+	void                        setPathfindingConsole(LLFloaterPathfindingConsole *pPathfindingConsole) {mPathfindingConsole = pPathfindingConsole;}
 
 protected:
 	LLRootHandle<LLNavMeshObserver> mObserverHandle;	
-	LLFloaterPathfindingSetup     *mPathfindingConsole;
+	LLFloaterPathfindingConsole     *mPathfindingConsole;
 };
 //===============================================================================
 class LLNavMeshDownloadObserver
@@ -61,12 +61,12 @@ public:
 	virtual ~LLNavMeshDownloadObserver() {}
 	//Accessor for the observers handle
 	const LLHandle<LLNavMeshDownloadObserver>& getObserverHandle() const { return mObserverHandle; }
-	LLFloaterPathfindingSetup *getPathfindingConsole() {return mPathfindingConsole;}
-	void                        setPathfindingConsole(LLFloaterPathfindingSetup *pPathfindingConsole) {mPathfindingConsole = pPathfindingConsole;}
+	LLFloaterPathfindingConsole *getPathfindingConsole() {return mPathfindingConsole;}
+	void                        setPathfindingConsole(LLFloaterPathfindingConsole *pPathfindingConsole) {mPathfindingConsole = pPathfindingConsole;}
 
 protected:
 	LLRootHandle<LLNavMeshDownloadObserver> mObserverHandle;	
-	LLFloaterPathfindingSetup *mPathfindingConsole;
+	LLFloaterPathfindingConsole *mPathfindingConsole;
 };
 //===============================================================================
 class LLNavMeshStation : public LLSingleton<LLNavMeshStation>
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index e4d17e9d25..5b6b07a49a 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -248,7 +248,7 @@ void LLViewerFloaterReg::registerFloaters()
 
 	LLFloaterReg::add("pathfinding_characters", "floater_pathfinding_characters.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingCharacters>);
 	LLFloaterReg::add("pathfinding_linksets", "floater_pathfinding_linksets.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingLinksets>);
-	LLFloaterReg::add("pathfinding_setup", "floater_pathfinding_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingSetup>);
+	LLFloaterReg::add("pathfinding_console", "floater_pathfinding_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingConsole>);
 	LLFloaterReg::add("people", "floater_people.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
 	LLFloaterReg::add("places", "floater_places.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
 	LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>);
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 9109b5379b..33d959f8de 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -966,7 +966,7 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK
 		MASK currentKeyMask = gKeyboard->currentMask(TRUE);
 		if ( !(currentKeyMask & MASK_ALT) )
 		{
-			LLFloaterPathfindingSetup* pFloater = LLFloaterReg::getTypedInstance<LLFloaterPathfindingSetup>("pathfinding_setup");
+			LLFloaterPathfindingConsole* pFloater = LLFloaterReg::getTypedInstance<LLFloaterPathfindingConsole>("pathfinding_console");
 			if ( pFloater )
 			{
 				//The floater takes care of determining what stage - essentially where the data goes into the pathing packet(start or end)
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d8f9453b09..d9a626be14 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -938,10 +938,10 @@
          tear_off="false">
         <menu_item_call
             label="Setup..."
-            name="pathfinding_setup_menu_item">
+            name="pathfinding_console_menu_item">
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
-              parameter="pathfinding_setup" />
+              parameter="pathfinding_console" />
         </menu_item_call>
         <menu_item_call
             label="Linksets..."