From fe2b04119546a4f2c6ea9faccc6208aba0488bcc Mon Sep 17 00:00:00 2001 From: prep Date: Fri, 3 Feb 2012 14:41:17 -0500 Subject: Path-118: Enable viewer to handle submitting multiple navmesh regions to the LLPathingLibrary. --- indra/newview/llfloaterpathfindingsetup.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra') 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 regions; regions.push_back( pCurrentRegion ); - //pCurrentRegion->getNeighboringRegions( regions ); + pCurrentRegion->getNeighboringRegions( regions ); std::vector 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() ) -- cgit v1.2.3