From 6f6641219ea36ad0b4c3b39d0a35c55b1bf0a2fc Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 11 Jan 2012 11:25:45 -0800
Subject: Changing the name of the fetch states to be more informative.

---
 indra/newview/llfloaterpathfindinglinksets.cpp | 14 +++++++-------
 indra/newview/llfloaterpathfindinglinksets.h   |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp
index 87f667154a..699e105a31 100644
--- a/indra/newview/llfloaterpathfindinglinksets.cpp
+++ b/indra/newview/llfloaterpathfindinglinksets.cpp
@@ -390,8 +390,8 @@ BOOL LLFloaterPathfindingLinksets::isFetchInProgress() const
 	switch (getFetchState())
 	{
 	case kFetchStarting :
-	case kFetchInProgress :
-	case kFetchInProgress_MultiRequested :
+	case kFetchRequestSent :
+	case kFetchRequestSent_MultiRequested :
 	case kFetchReceived :
 		retVal = true;
 		break;
@@ -420,9 +420,9 @@ void LLFloaterPathfindingLinksets::sendNavmeshDataGetRequest()
 {
 	if (isFetchInProgress())
 	{
-		if (getFetchState() == kFetchInProgress)
+		if (getFetchState() == kFetchRequestSent)
 		{
-			setFetchState(kFetchInProgress_MultiRequested);
+			setFetchState(kFetchRequestSent_MultiRequested);
 		}
 	}
 	else
@@ -441,7 +441,7 @@ void LLFloaterPathfindingLinksets::sendNavmeshDataGetRequest()
 			}
 			else
 			{
-				setFetchState(kFetchInProgress);
+				setFetchState(kFetchRequestSent);
 				LLHTTPClient::get(navmeshDataURL, new NavmeshDataGetResponder(navmeshDataURL, this));
 			}
 		}
@@ -581,10 +581,10 @@ void LLFloaterPathfindingLinksets::updateLinksetsStatusMessage()
 	case kFetchStarting :
 		statusText = getString("linksets_fetching_starting");
 		break;
-	case kFetchInProgress :
+	case kFetchRequestSent :
 		statusText = getString("linksets_fetching_inprogress");
 		break;
-	case kFetchInProgress_MultiRequested :
+	case kFetchRequestSent_MultiRequested :
 		statusText = getString("linksets_fetching_inprogress_multi_request");
 		break;
 	case kFetchReceived :
diff --git a/indra/newview/llfloaterpathfindinglinksets.h b/indra/newview/llfloaterpathfindinglinksets.h
index 693721429f..93bc3834a4 100644
--- a/indra/newview/llfloaterpathfindinglinksets.h
+++ b/indra/newview/llfloaterpathfindinglinksets.h
@@ -132,8 +132,8 @@ public:
 	{
 		kFetchInitial,
 		kFetchStarting,
-		kFetchInProgress,
-		kFetchInProgress_MultiRequested,
+		kFetchRequestSent,
+		kFetchRequestSent_MultiRequested,
 		kFetchReceived,
 		kFetchError,
 		kFetchComplete
-- 
cgit v1.2.3