process is no longer processing
This commit is contained in:
@@ -266,7 +266,7 @@ bool LLCurrencyUIManager::Impl::checkTransaction()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!mTransaction->process())
|
if (!mTransaction->is_finished())
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -866,7 +866,7 @@ bool LLFloaterBuyLandUI::checkTransaction()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!mTransaction->process())
|
if (!mTransaction->is_finished())
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1617,7 +1617,9 @@ void LLMeshUploadThread::doWholeModelUpload()
|
|||||||
new LLWholeModelUploadResponder(this, full_model_data, mUploadObserverHandle), mMeshUploadTimeOut);
|
new LLWholeModelUploadResponder(this, full_model_data, mUploadObserverHandle), mMeshUploadTimeOut);
|
||||||
do
|
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
|
//sleep for 10ms to prevent eating a whole core
|
||||||
apr_sleep(10000);
|
apr_sleep(10000);
|
||||||
} while (mCurlRequest->getQueued() > 0);
|
} while (mCurlRequest->getQueued() > 0);
|
||||||
|
|||||||
@@ -270,7 +270,7 @@ LLUserAuth::UserAuthcode LLUserAuth::authResponse()
|
|||||||
return mAuthResponse;
|
return mAuthResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool done = mTransaction->process();
|
bool done = mTransaction->is_finished();
|
||||||
|
|
||||||
if (!done) {
|
if (!done) {
|
||||||
if (LLXMLRPCTransaction::StatusDownloading == mTransaction->status(0))
|
if (LLXMLRPCTransaction::StatusDownloading == mTransaction->status(0))
|
||||||
|
|||||||
@@ -518,7 +518,7 @@ LLXMLRPCTransaction::~LLXMLRPCTransaction()
|
|||||||
delete &impl;
|
delete &impl;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool LLXMLRPCTransaction::process()
|
bool LLXMLRPCTransaction::is_finished(void) const
|
||||||
{
|
{
|
||||||
return impl.is_finished();
|
return impl.is_finished();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ public:
|
|||||||
StatusOtherError
|
StatusOtherError
|
||||||
} Status;
|
} Status;
|
||||||
|
|
||||||
bool process();
|
bool is_finished(void) const;
|
||||||
// Returns true when done.
|
// Returns true when done.
|
||||||
|
|
||||||
Status status(int* curlCode);
|
Status status(int* curlCode);
|
||||||
|
|||||||
Reference in New Issue
Block a user