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

Path-118: Enable viewer to handle submitting multiple navmesh regions to the LLPathingLibrary.

meow-7.2.2
prep 2012-02-03 14:41:17 -05:00
parent 0b2cace8da
commit fe2b041195
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloaterpathfindingsetup.cpp
View File

@ -317,7 +317,7 @@ void LLFloaterPathfindingSetup::setHasNavMeshReceived()
--mNavMeshCnt;
if ( mNavMeshCnt == 0 )
{
//LLPathingLib::getInstance()->stitchNavMeshes();
LLPathingLib::getInstance()->stitchNavMeshes();
}
}
@ -383,11 +383,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() )