From 65980a62abf6a4d6fb0d64e26febe40396f02d24 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 10 Apr 2012 10:32:52 -0700
Subject: BUILDFIX: Correcting a build error.

---
 indra/newview/llpathfindingpathtool.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpathfindingpathtool.h b/indra/newview/llpathfindingpathtool.h
index 80d3b4cceb..d9dff3611b 100644
--- a/indra/newview/llpathfindingpathtool.h
+++ b/indra/newview/llpathfindingpathtool.h
@@ -60,8 +60,6 @@ public:
 		kCharacterTypeD
 	} ECharacterType;
 
-	typedef 
-
 	LLPathfindingPathTool();
 	virtual ~LLPathfindingPathTool();
 
-- 
cgit v1.2.3


From df47f35d8fce6eb84ca4b26112e7af506616f4a5 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 10 Apr 2012 11:09:28 -0700
Subject: Altering how the toolset is swapped into and out-of test path mode.

---
 indra/newview/llfloaterpathfindingconsole.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 7941fd52af..afbf589e5e 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -891,17 +891,21 @@ void LLFloaterPathfindingConsole::setAgentState(LLPathfindingManager::EAgentStat
 void LLFloaterPathfindingConsole::switchIntoTestPathMode()
 {
 	llassert(mPathfindingToolset != NULL);
-	llassert(mSavedToolset == NULL);
-	mSavedToolset = LLToolMgr::getInstance()->getCurrentToolset();
-	LLToolMgr::getInstance()->setCurrentToolset(mPathfindingToolset);
+	LLToolMgr *toolMgrInstance = LLToolMgr::getInstance();
+	if (toolMgrInstance->getCurrentToolset() != mPathfindingToolset)
+	{
+		mSavedToolset = toolMgrInstance->getCurrentToolset();
+		toolMgrInstance->setCurrentToolset(mPathfindingToolset);
+	}
 }
 
 void LLFloaterPathfindingConsole::switchOutOfTestPathMode()
 {
 	llassert(mPathfindingToolset != NULL);
-	if (mSavedToolset != NULL)
+	LLToolMgr *toolMgrInstance = LLToolMgr::getInstance();
+	if (toolMgrInstance->getCurrentToolset() == mPathfindingToolset)
 	{
-		LLToolMgr::getInstance()->setCurrentToolset(mSavedToolset);
+		toolMgrInstance->setCurrentToolset(mSavedToolset);
 		mSavedToolset = NULL;
 	}
 }
-- 
cgit v1.2.3


From 7f49803dd284417674988a4de5262ad63f66d092 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 10 Apr 2012 11:13:12 -0700
Subject: BUILDFIX: Correcting one more build issue on linux and mac platforms.

---
 indra/newview/llpathfindingpathtool.cpp | 2 +-
 indra/newview/llpathfindingpathtool.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpathfindingpathtool.cpp b/indra/newview/llpathfindingpathtool.cpp
index f27c722264..9acb04a486 100644
--- a/indra/newview/llpathfindingpathtool.cpp
+++ b/indra/newview/llpathfindingpathtool.cpp
@@ -32,7 +32,7 @@
 #include "llviewerwindow.h"
 #include "llviewercamera.h"
 #include "llpathfindingmanager.h"
-#include "llpathinglib.h"
+#include "LLPathingLib.h"
 
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
diff --git a/indra/newview/llpathfindingpathtool.h b/indra/newview/llpathfindingpathtool.h
index d9dff3611b..1e17b71bd3 100644
--- a/indra/newview/llpathfindingpathtool.h
+++ b/indra/newview/llpathfindingpathtool.h
@@ -30,7 +30,7 @@
 
 #include "llsingleton.h"
 #include "lltool.h"
-#include "llpathinglib.h"
+#include "LLPathingLib.h"
 
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
-- 
cgit v1.2.3