diff options
Diffstat (limited to 'indra/newview/llfloaterpathfindingsetup.cpp')
| -rw-r--r-- | indra/newview/llfloaterpathfindingsetup.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/llfloaterpathfindingsetup.cpp b/indra/newview/llfloaterpathfindingsetup.cpp index f5df1fe0de..dc8e96eb53 100644 --- a/indra/newview/llfloaterpathfindingsetup.cpp +++ b/indra/newview/llfloaterpathfindingsetup.cpp @@ -317,7 +317,7 @@ void LLFloaterPathfindingSetup::setHasNavMeshReceived() --mNavMeshCnt; if ( mNavMeshCnt == 0 ) { - //LLPathingLib::getInstance()->stitchNavMeshes(); + LLPathingLib::getInstance()->stitchNavMeshes(); } } @@ -372,7 +372,9 @@ void LLFloaterPathfindingSetup::onOpen(const LLSD& pKey) llwarns <<"Errror: cannout find pathing library implementation."<<llendl; } else - { + { + LLPathingLib::getInstance()->cleanupResidual(); + mCurrentMDO = 0; mNavMeshCnt = 0; @@ -383,11 +385,11 @@ void LLFloaterPathfindingSetup::onOpen(const LLSD& pKey) LLViewerRegion* pCurrentRegion = gAgent.getRegion(); std::vector<LLViewerRegion*> regions; regions.push_back( pCurrentRegion ); - //pCurrentRegion->getNeighboringRegions( regions ); + pCurrentRegion->getNeighboringRegions( regions ); std::vector<int> shift; shift.push_back( CURRENT_REGION ); - //pCurrentRegion->getNeighboringRegionsStatus( shift ); + pCurrentRegion->getNeighboringRegionsStatus( shift ); //If the navmesh shift ops and the total region counts do not match - use the current region, only. if ( shift.size() != regions.size() ) @@ -619,9 +621,6 @@ void LLFloaterPathfindingSetup::providePathingData( const LLVector3& point1, con switch (getPathSelectionState()) { case kPathSelectNone : - llwarns << "not yet been implemented to toggle '" - << mPathSelectionRadioGroup->getName() << "' to PathSelectNone" - << llendl; break; case kPathSelectStartPoint : |