livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changing the name of the fetch states to be more informative.

meow-7.2.2
Todd Stinson 2012-01-11 11:25:45 -08:00
parent 82295222c4
commit 6f6641219e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfloaterpathfindinglinksets.cpp
View File

@ -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 :

4
indra/newview/llfloaterpathfindinglinksets.h
View File

@ -132,8 +132,8 @@ public:
{
kFetchInitial,
kFetchStarting,
kFetchInProgress,
kFetchInProgress_MultiRequested,
kFetchRequestSent,
kFetchRequestSent_MultiRequested,
kFetchReceived,
kFetchError,
kFetchComplete