Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.

meow-7.2.2
Todd Stinson 2012-02-13 18:18:01 -08:00
commit 0f61d3e60f
1 changed files with 2 additions and 2 deletions

View File

@ -297,11 +297,11 @@ void LLFloaterPathfindingConsole::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() )