diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 16:13:23 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 16:13:23 -0800 |
| commit | 90b8fb07ccd46bd18f3629ae2ec04a47312b41cb (patch) | |
| tree | 2e0a016cf2a0a3a869086dbde4e2f372bfe3f2c1 /indra/llmessage/llurlrequest.cpp | |
| parent | e826cbd90750fd38565e4e44390948f36254cf1f (diff) | |
| parent | e859c3446b5c631fe0a9806434aa19b64a0d9113 (diff) | |
Merge with latest from viewer-experience
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) |