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

Altering how the toolset is swapped into and out-of test path mode.

master
Todd Stinson 2012-04-10 11:09:28 -07:00
parent 65980a62ab
commit df47f35d8f
1 changed files with 9 additions and 5 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;
}
}