From 546c2583af7e34784a9e970c70fcfe47ba691e4d Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 5 Jun 2012 15:35:12 -0700
Subject: Altering the method name.

---
 indra/newview/llfloaterpathfindingcharacters.cpp | 9 +++++----
 indra/newview/llfloaterpathfindingcharacters.h   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp
index b97123b1bc..d159cc04f2 100644
--- a/indra/newview/llfloaterpathfindingcharacters.cpp
+++ b/indra/newview/llfloaterpathfindingcharacters.cpp
@@ -32,15 +32,16 @@
 #include "llcheckboxctrl.h"
 #include "llfloaterreg.h"
 #include "llfloaterpathfindingobjects.h"
+#include "llhandle.h"
 #include "llpathfindingcharacter.h"
 #include "llpathfindingcharacterlist.h"
 #include "llpathfindingmanager.h"
 #include "llpathfindingobjectlist.h"
 #include "llsd.h"
 #include "lluicolortable.h"
-
-#include "pipeline.h"
+#include "llviewerobject.h"
 #include "llviewerobjectlist.h"
+#include "pipeline.h"
 
 LLHandle<LLFloaterPathfindingCharacters> LLFloaterPathfindingCharacters::sInstanceHandle;
 
@@ -163,7 +164,7 @@ void LLFloaterPathfindingCharacters::updateControls()
 {
 	LLFloaterPathfindingObjects::updateControls();
 	updateOnScrollListChange();
-	updateStateOnEditFields();
+	updateStateOnActionFields();
 }
 
 S32 LLFloaterPathfindingCharacters::getNameColumnIndex() const
@@ -232,7 +233,7 @@ LLSD LLFloaterPathfindingCharacters::buildCharacterScrollListData(const LLPathfi
 	return element;
 }
 
-void LLFloaterPathfindingCharacters::updateStateOnEditFields()
+void LLFloaterPathfindingCharacters::updateStateOnActionFields()
 {
 	int numSelectedItems = getNumSelectedObjects();;
 #ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
diff --git a/indra/newview/llfloaterpathfindingcharacters.h b/indra/newview/llfloaterpathfindingcharacters.h
index 7f586359df..fe24b6c562 100644
--- a/indra/newview/llfloaterpathfindingcharacters.h
+++ b/indra/newview/llfloaterpathfindingcharacters.h
@@ -73,7 +73,7 @@ private:
 
 	LLSD buildCharacterScrollListData(const LLPathfindingCharacter *pCharacterPtr) const;
 
-	void updateStateOnEditFields();
+	void updateStateOnActionFields();
 	void updateOnScrollListChange();
 
 	void showCapsule() const;
-- 
cgit v1.2.3