diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
commit | 761bf254a4e72ec521ff1a52ac12f8594a350818 (patch) | |
tree | c72f84bb4ac319c10299a35934b52a09a73a127d /indra/llmessage/llurlrequest.cpp | |
parent | a2fa9a2bc26bb67c0bb952d3295c380dcb853eb5 (diff) | |
parent | 1e41b017e1713a35eb68190d279cf8d28791b6d2 (diff) |
merge changes for 3.6.0-release
Diffstat (limited to 'indra/llmessage/llurlrequest.cpp')
-rwxr-xr-x | indra/llmessage/llurlrequest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index 627d591839..de9e2fe294 100755 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -314,11 +314,11 @@ LLIOPipe::EStatus LLURLRequest::process_impl( const F32 TIMEOUT_ADJUSTMENT = 2.0f; mDetail->mByteAccumulator = 0; pump->adjustTimeoutSeconds(TIMEOUT_ADJUSTMENT); - lldebugs << "LLURLRequest adjustTimeoutSeconds for request: " << mDetail->mURL << llendl; - if (mState == STATE_INITIALIZED) - { - llinfos << "LLURLRequest adjustTimeoutSeconds called during upload" << llendl; - } + lldebugs << "LLURLRequest adjustTimeoutSeconds for request: " << mDetail->mURL << llendl; + if (mState == STATE_INITIALIZED) + { + llinfos << "LLURLRequest adjustTimeoutSeconds called during upload" << llendl; + } } switch(mState) |