diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-13 17:19:52 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-13 17:19:52 -0700 |
| commit | 8973a3db31af2e3ce77fb3c614f15aac65a0ed07 (patch) | |
| tree | 041bd7092dad94368a5d4acbc353b4bca66d054b /indra/newview/llpathfindingmanager.cpp | |
| parent | 379aff3520d368d1119e00f46684670030472832 (diff) | |
| parent | 76f7c0e58c75add62c0fb989bf13bfa50952c4bd (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview/llpathfindingmanager.cpp')
| -rw-r--r-- | indra/newview/llpathfindingmanager.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp index fc296a4b83..7ce34fcfcb 100644 --- a/indra/newview/llpathfindingmanager.cpp +++ b/indra/newview/llpathfindingmanager.cpp @@ -333,7 +333,7 @@ LLPathfindingNavMesh::navmesh_slot_t LLPathfindingManager::registerNavMeshListen void LLPathfindingManager::requestGetNavMeshForRegion(LLViewerRegion *pRegion) { LLPathfindingNavMeshPtr navMeshPtr = getNavMeshForRegion(pRegion); - + if (pRegion == NULL) { navMeshPtr->handleNavMeshNotEnabled(); @@ -702,31 +702,30 @@ void LLPathfindingManager::displayNavMeshRebakePanel() panel_nmr_container->setVisible( TRUE ); panel_namesh_rebake->reparent( rootp ); LLPanelNavMeshRebake::getInstance()->setVisible( TRUE ); + LLPanelNavMeshRebake::getInstance()->resetButtonStates(); } -void LLPathfindingManager::hideNavMeshRebakePanel() +void LLPathfindingManager::hideNavMeshRebakePanel() { LLPanelNavMeshRebake::getInstance()->setVisible( FALSE ); } -void LLPathfindingManager::handleNavMeshRebakeResult( const LLSD &pContent ) +void LLPathfindingManager::handleNavMeshRebakeError(U32 pStatus, const std::string &pReason, const std::string &pURL) { - + llwarns << "error with request to URL '" << pURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl; } -void LLPathfindingManager::handleNavMeshRebakeError(U32 pStatus, const std::string &pReason, const std::string &pURL) +void LLPathfindingManager::handleNavMeshRebakeResult( const LLSD &pContent ) { - llwarns << "error with request to URL '" << pURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl; + hideNavMeshRebakePanel(); } -//prep# + void LLPathfindingManager::triggerNavMeshRebuild() { - LLSD mPostData; std::string url = getNavMeshStatusURLForRegion( getCurrentRegion() ); - if ( url.empty() ) { - //prep#fix#error? + llwarns << "Error with request due to nonexistent URL"<<llendl; } else { @@ -735,7 +734,6 @@ void LLPathfindingManager::triggerNavMeshRebuild() LLHTTPClient::ResponderPtr responder = new NavMeshRebakeResponder( url ); LLHTTPClient::post( url, mPostData, responder ); } - } //--------------------------------------------------------------------------- // LLNavMeshSimStateChangeNode |