diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-29 14:43:48 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-29 14:43:48 -0600 |
| commit | 472928043a82ff8f622c96df73c5938c9fb7a455 (patch) | |
| tree | d795d47eff1c609b42ab3b57be3a7c11538b1b23 /indra/llmessage/llurlrequest.cpp | |
| parent | 893b5e16b81ead08ef22b03594e0a835df525778 (diff) | |
| parent | 85392acac0a10e274a3134180265b7b233d8b479 (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) |