diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-05 14:37:06 -0500 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-05 14:37:06 -0500 |
commit | bf8e1137012c1e26d570545db1feda77c60aa6ba (patch) | |
tree | f2a0da29601da94b496c545436c1ef310bc4bed5 /indra/llmessage/llurlrequest.cpp | |
parent | d8aa31d10a89aa826cc549594c083a054a2ad967 (diff) | |
parent | 7026c80d51128854458f585e50b3b9e3ecab555a (diff) |
merge
Diffstat (limited to 'indra/llmessage/llurlrequest.cpp')
-rw-r--r-- | indra/llmessage/llurlrequest.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index fa03bb7512..a3a2b2b1b8 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -170,6 +170,7 @@ LLURLRequest::~LLURLRequest() { LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST); delete mDetail; + mDetail = NULL ; } void LLURLRequest::setURL(const std::string& url) @@ -344,7 +345,10 @@ LLIOPipe::EStatus LLURLRequest::process_impl( static LLFastTimer::DeclareTimer FTM_URL_PERFORM("Perform"); { LLFastTimer t(FTM_URL_PERFORM); - mDetail->mCurlRequest->perform(); + if(!mDetail->mCurlRequest->wait()) + { + return status ; + } } while(1) |