From 9767b5a026ba1b442ad1aa438f5957375a997c14 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Wed, 13 Jun 2012 15:31:44 -0400
Subject: Path-722: Reset buttons to default state.

---
 indra/newview/llpathfindingmanager.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'indra/newview/llpathfindingmanager.cpp')

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
-- 
cgit v1.2.3