process is no longer processing

This commit is contained in:
Aleric Inglewood
2012-07-17 19:27:14 +02:00
parent 900e533b4b
commit 64b968b262
6 changed files with 8 additions and 6 deletions

View File

@@ -266,7 +266,7 @@ bool LLCurrencyUIManager::Impl::checkTransaction()
return false;
}
if (!mTransaction->process())
if (!mTransaction->is_finished())
{
return false;
}

View File

@@ -866,7 +866,7 @@ bool LLFloaterBuyLandUI::checkTransaction()
return false;
}
if (!mTransaction->process())
if (!mTransaction->is_finished())
{
return false;
}

View File

@@ -1617,7 +1617,9 @@ void LLMeshUploadThread::doWholeModelUpload()
new LLWholeModelUploadResponder(this, full_model_data, mUploadObserverHandle), mMeshUploadTimeOut);
do
{
mCurlRequest->process();
mCurlRequest->process(); // FIXME: This function does not exist anymore. The post() gets CPU time from AICurlEasyRequestStateMachine.
// Therefore, if we do not want to continue here unless this upload is done... no wait, that would
// be blocking and we don't want blocking...
//sleep for 10ms to prevent eating a whole core
apr_sleep(10000);
} while (mCurlRequest->getQueued() > 0);

View File

@@ -270,7 +270,7 @@ LLUserAuth::UserAuthcode LLUserAuth::authResponse()
return mAuthResponse;
}
bool done = mTransaction->process();
bool done = mTransaction->is_finished();
if (!done) {
if (LLXMLRPCTransaction::StatusDownloading == mTransaction->status(0))

View File

@@ -518,7 +518,7 @@ LLXMLRPCTransaction::~LLXMLRPCTransaction()
delete &impl;
}
bool LLXMLRPCTransaction::process()
bool LLXMLRPCTransaction::is_finished(void) const
{
return impl.is_finished();
}

View File

@@ -110,7 +110,7 @@ public:
StatusOtherError
} Status;
bool process();
bool is_finished(void) const;
// Returns true when done.
Status status(int* curlCode);