diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-02-13 18:18:01 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-02-13 18:18:01 -0800 |
| commit | 0f61d3e60f89f4a2b22732c5acf1ff85bbbe4f77 (patch) | |
| tree | e348f284c4c03384558a4eb80bd6e953165aaace /indra/newview | |
| parent | ec75e317a4375b0dd014f2b4388942995eefc798 (diff) | |
| parent | 666bd487bd8248bd05c87a437c06e18ed89b1153 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterpathfindingconsole.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp index 47bba82293..e361b62a6e 100644 --- a/indra/newview/llfloaterpathfindingconsole.cpp +++ b/indra/newview/llfloaterpathfindingconsole.cpp @@ -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() )
|