summaryrefslogtreecommitdiff
path: root/indra/newview/llpathfindingmanager.cpp
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-03-12 19:18:19 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-03-12 19:18:19 -0700
commitc990cc71ce124059a072c7778ac962253bacb199 (patch)
tree45ab7ed430d91baf7dc41f30aea7ffbbb632f627 /indra/newview/llpathfindingmanager.cpp
parentb3197fc12e41bc60e3510d840c67ef98816c3ae8 (diff)
PATH-304: Adding an extra state for the pathfinding console to report that the status of the navmesh is being checked.
Diffstat (limited to 'indra/newview/llpathfindingmanager.cpp')
-rw-r--r--indra/newview/llpathfindingmanager.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 9cd3d5625c..9abd9fda1a 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -274,11 +274,13 @@ void LLPathfindingManager::requestGetNavMeshForRegion(LLViewerRegion *pRegion)
}
else
{
+ navMeshPtr->handleNavMeshCheckVersion();
LLHTTPClient::ResponderPtr navMeshStatusResponder = new NavMeshStatusResponder(navMeshStatusURL, pRegion);
LLHTTPClient::get(navMeshStatusURL, navMeshStatusResponder);
}
#else // DEPRECATED_UNVERSIONED_NAVMESH
llassert(!navMeshStatusURL.empty());
+ navMeshPtr->handleNavMeshCheckVersion();
LLHTTPClient::ResponderPtr navMeshStatusResponder = new NavMeshStatusResponder(navMeshStatusURL, pRegion);
LLHTTPClient::get(navMeshStatusURL, navMeshStatusResponder);
#endif // DEPRECATED_UNVERSIONED_NAVMESH
@@ -297,7 +299,7 @@ void LLPathfindingManager::handleNavMeshStatusRequest(const LLPathfindingNavMesh
{
if (navMeshPtr->hasNavMeshVersion(pNavMeshStatus.getVersion()))
{
- navMeshPtr->handleRefresh();
+ navMeshPtr->handleRefresh(pNavMeshStatus.getVersion());
}
else
{