livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
prep 2012-04-10 14:35:04 -04:00
parent 31543e637b 7f49803dd2
commit 9af840bcd4
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfloaterpathfindingconsole.cpp
View File

@ -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;
}
}

2
indra/newview/llpathfindingpathtool.cpp
View File

@ -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>

4
indra/newview/llpathfindingpathtool.h
View File

@ -30,7 +30,7 @@
#include "llsingleton.h"
#include "lltool.h"
#include "llpathinglib.h"
#include "LLPathingLib.h"
#include <boost/function.hpp>
#include <boost/signals2.hpp>
@ -60,8 +60,6 @@ public:
kCharacterTypeD
} ECharacterType;
typedef
LLPathfindingPathTool();
virtual ~LLPathfindingPathTool();