summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorprep <none@none>2012-02-03 14:41:17 -0500
committerprep <none@none>2012-02-03 14:41:17 -0500
commitfe2b04119546a4f2c6ea9faccc6208aba0488bcc (patch)
tree3ab74f007d20d6d059ae8fdd3a29ae9f752a44c6 /indra
parent0b2cace8dae7197dc9764876814344a9bfa68fdb (diff)
Path-118: Enable viewer to handle submitting multiple navmesh regions to the LLPathingLibrary.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaterpathfindingsetup.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterpathfindingsetup.cpp b/indra/newview/llfloaterpathfindingsetup.cpp
index 0ac5705b89..3c02d2d237 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();
}
}
@@ -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() )