From 114509270ef592900a0df73390257537a0866e76 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 20 Dec 2011 17:10:09 -0800
Subject: Parameter name change.

---
 indra/newview/llfloaterpathfindingconsole.cpp | 33 ++++++++++++++-------------
 indra/newview/llfloaterpathfindingconsole.h   | 16 ++++++-------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 7ee9ac4d1b..abb8844544 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -139,11 +139,11 @@ LLFloaterPathfindingConsole::ERegionOverlayDisplay LLFloaterPathfindingConsole::
 	return regionOverlayDisplay;
 }
 
-void LLFloaterPathfindingConsole::setRegionOverlayDisplay(ERegionOverlayDisplay regionOverlayDisplay)
+void LLFloaterPathfindingConsole::setRegionOverlayDisplay(ERegionOverlayDisplay pRegionOverlayDisplay)
 {
 	LLSD radioGroupValue;
 
-	switch (regionOverlayDisplay)
+	switch (pRegionOverlayDisplay)
 	{
 	case kRenderOverlayOnFixedPhysicsGeometry :
 		radioGroupValue = XUI_RENDER_OVERLAY_ON_FIXED_PHYSICS_GEOMETRY;
@@ -180,11 +180,11 @@ LLFloaterPathfindingConsole::EPathSelectionState LLFloaterPathfindingConsole::ge
 	return pathSelectionState;
 }
 
-void LLFloaterPathfindingConsole::setPathSelectionState(EPathSelectionState pathSelectionState)
+void LLFloaterPathfindingConsole::setPathSelectionState(EPathSelectionState pPathSelectionState)
 {
 	LLSD radioGroupValue;
 
-	switch (pathSelectionState)
+	switch (pPathSelectionState)
 	{
 	case kPathSelectStartPoint :
 		radioGroupValue = XUI_PATH_SELECT_START_POINT;
@@ -205,9 +205,9 @@ F32 LLFloaterPathfindingConsole::getCharacterWidth() const
 	return mCharacterWidthSlider->getValueF32();
 }
 
-void LLFloaterPathfindingConsole::setCharacterWidth(F32 characterWidth)
+void LLFloaterPathfindingConsole::setCharacterWidth(F32 pCharacterWidth)
 {
-	mCharacterWidthSlider->setValue(LLSD(characterWidth));
+	mCharacterWidthSlider->setValue(LLSD(pCharacterWidth));
 }
 
 LLFloaterPathfindingConsole::ECharacterType LLFloaterPathfindingConsole::getCharacterType() const
@@ -237,11 +237,11 @@ LLFloaterPathfindingConsole::ECharacterType LLFloaterPathfindingConsole::getChar
 	return characterType;
 }
 
-void LLFloaterPathfindingConsole::setCharacterType(ECharacterType characterType)
+void LLFloaterPathfindingConsole::setCharacterType(ECharacterType pCharacterType)
 {
 	LLSD radioGroupValue;
 
-	switch (characterType)
+	switch (pCharacterType)
 	{
 	case kCharacterTypeA :
 		radioGroupValue = XUI_CHARACTER_TYPE_A;
@@ -269,9 +269,9 @@ F32 LLFloaterPathfindingConsole::getTerrainMaterialA() const
 	return mTerrainMaterialA->getValue().asReal();
 }
 
-void LLFloaterPathfindingConsole::setTerrainMaterialA(F32 terrainMaterial)
+void LLFloaterPathfindingConsole::setTerrainMaterialA(F32 pTerrainMaterial)
 {
-	mTerrainMaterialA->setValue(LLSD(terrainMaterial));
+	mTerrainMaterialA->setValue(LLSD(pTerrainMaterial));
 }
 
 F32 LLFloaterPathfindingConsole::getTerrainMaterialB() const
@@ -279,9 +279,9 @@ F32 LLFloaterPathfindingConsole::getTerrainMaterialB() const
 	return mTerrainMaterialB->getValue().asReal();
 }
 
-void LLFloaterPathfindingConsole::setTerrainMaterialB(F32 terrainMaterial)
+void LLFloaterPathfindingConsole::setTerrainMaterialB(F32 pTerrainMaterial)
 {
-	mTerrainMaterialB->setValue(LLSD(terrainMaterial));
+	mTerrainMaterialB->setValue(LLSD(pTerrainMaterial));
 }
 
 F32 LLFloaterPathfindingConsole::getTerrainMaterialC() const
@@ -289,9 +289,9 @@ F32 LLFloaterPathfindingConsole::getTerrainMaterialC() const
 	return mTerrainMaterialC->getValue().asReal();
 }
 
-void LLFloaterPathfindingConsole::setTerrainMaterialC(F32 terrainMaterial)
+void LLFloaterPathfindingConsole::setTerrainMaterialC(F32 pTerrainMaterial)
 {
-	mTerrainMaterialC->setValue(LLSD(terrainMaterial));
+	mTerrainMaterialC->setValue(LLSD(pTerrainMaterial));
 }
 
 F32 LLFloaterPathfindingConsole::getTerrainMaterialD() const
@@ -299,9 +299,9 @@ F32 LLFloaterPathfindingConsole::getTerrainMaterialD() const
 	return mTerrainMaterialD->getValue().asReal();
 }
 
-void LLFloaterPathfindingConsole::setTerrainMaterialD(F32 terrainMaterial)
+void LLFloaterPathfindingConsole::setTerrainMaterialD(F32 pTerrainMaterial)
 {
-	mTerrainMaterialD->setValue(LLSD(terrainMaterial));
+	mTerrainMaterialD->setValue(LLSD(pTerrainMaterial));
 }
 
 LLFloaterPathfindingConsole::LLFloaterPathfindingConsole(const LLSD& pSeed)
@@ -535,6 +535,7 @@ void LLFloaterPathfindingConsole::onTerrainMaterialDSet()
 	llwarns << "functionality has not yet been implemented to setting '" << mTerrainMaterialD->getName()
 		<< "' to value (" << terrainMaterial << ")" << llendl;
 }
+
 BOOL LLFloaterPathfindingConsole::allowAllRenderables()
 {
 	return getRegionOverlayDisplay() == kRenderOverlayOnAllRenderableGeometry ? true : false;
diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h
index a5e8a48263..4a2fcf8668 100644
--- a/indra/newview/llfloaterpathfindingconsole.h
+++ b/indra/newview/llfloaterpathfindingconsole.h
@@ -68,28 +68,28 @@ public:
 	BOOL allowAllRenderables();
 
 	ERegionOverlayDisplay getRegionOverlayDisplay() const;
-	void                  setRegionOverlayDisplay(ERegionOverlayDisplay regionOverlayDisplay);
+	void                  setRegionOverlayDisplay(ERegionOverlayDisplay pRegionOverlayDisplay);
 
 	EPathSelectionState   getPathSelectionState() const;
-	void                  setPathSelectionState(EPathSelectionState pathSelectionState);
+	void                  setPathSelectionState(EPathSelectionState pPathSelectionState);
 
 	F32                   getCharacterWidth() const;
-	void                  setCharacterWidth(F32 characterWidth);
+	void                  setCharacterWidth(F32 pCharacterWidth);
 
 	ECharacterType        getCharacterType() const;
-	void                  setCharacterType(ECharacterType characterType);
+	void                  setCharacterType(ECharacterType pCharacterType);
 
 	F32                   getTerrainMaterialA() const;
-	void                  setTerrainMaterialA(F32 terrainMaterial);
+	void                  setTerrainMaterialA(F32 pTerrainMaterial);
 
 	F32                   getTerrainMaterialB() const;
-	void                  setTerrainMaterialB(F32 terrainMaterial);
+	void                  setTerrainMaterialB(F32 pTerrainMaterial);
 
 	F32                   getTerrainMaterialC() const;
-	void                  setTerrainMaterialC(F32 terrainMaterial);
+	void                  setTerrainMaterialC(F32 pTerrainMaterial);
 
 	F32                   getTerrainMaterialD() const;
-	void                  setTerrainMaterialD(F32 terrainMaterial);
+	void                  setTerrainMaterialD(F32 pTerrainMaterial);
 
 protected:
 
-- 
cgit v1.2.3