diff options
| author | prep <prep@lindenlab.com> | 2012-06-18 12:27:46 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-06-18 12:27:46 -0400 |
| commit | 329b98528ea4fdd34baaa225e4aa46ea8ad5bfe1 (patch) | |
| tree | 1e4d8488913eec8eebbc6ab4579ad405d3124c20 /indra/newview/llpathfindingmanager.cpp | |
| parent | 583855f3e6ba45915c0031396ed90054a18c4c4d (diff) | |
| parent | 501127e4649cf6cdb8e1c31d66d8d24e20fe0631 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpathfindingmanager.cpp')
| -rw-r--r-- | indra/newview/llpathfindingmanager.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp index 16283282fb..a77d6bcc4c 100644 --- a/indra/newview/llpathfindingmanager.cpp +++ b/indra/newview/llpathfindingmanager.cpp @@ -285,10 +285,7 @@ LLPathfindingManager::LLPathfindingManager() mShowNavMeshRebake(false), mCrossingSlot() { - if ( !mCrossingSlot.connected() ) - { - mCrossingSlot = LLEnvManagerNew::getInstance()->setRegionChangeCallback(boost::bind(&LLPathfindingManager::onRegionBoundaryCrossed, this)); - } + } void LLPathfindingManager::onRegionBoundaryCrossed() @@ -616,6 +613,11 @@ LLPathfindingNavMeshPtr LLPathfindingManager::getNavMeshForRegion(LLViewerRegion void LLPathfindingManager::requestGetAgentState() { + if ( !mCrossingSlot.connected() ) + { + mCrossingSlot = LLEnvManagerNew::getInstance()->setRegionChangeCallback(boost::bind(&LLPathfindingManager::onRegionBoundaryCrossed, this)); + } + std::string agentStateURL = getAgentStateURLForCurrentRegion( getCurrentRegion() ); if ( !agentStateURL.empty() ) |