diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-10 15:10:48 -0700 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-10 15:10:48 -0700 |
commit | 4a3bdb689673adfb3d4821b625d6af182de90eee (patch) | |
tree | cf1bea273da999825b574a1b02e164a67a3284b1 /indra/llmessage | |
parent | 9edd6286434106c1513205d6da039144f0ad329a (diff) | |
parent | 29cdf94e95d0a4365bd18860c4759f9a6a13f45a (diff) |
Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179.
Diffstat (limited to 'indra/llmessage')
-rw-r--r-- | indra/llmessage/llurlrequest.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index a16f5c7bf0..f3f0007205 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -289,6 +289,8 @@ LLIOPipe::EStatus LLURLRequest::handleError( } static LLFastTimer::DeclareTimer FTM_PROCESS_URL_REQUEST("URL Request"); +static LLFastTimer::DeclareTimer FTM_PROCESS_URL_REQUEST_GET_RESULT("Get Result"); +static LLFastTimer::DeclareTimer FTM_URL_PERFORM("Perform"); // virtual LLIOPipe::EStatus LLURLRequest::process_impl( @@ -358,7 +360,6 @@ LLIOPipe::EStatus LLURLRequest::process_impl( { PUMP_DEBUG; LLIOPipe::EStatus status = STATUS_BREAK; - static LLFastTimer::DeclareTimer FTM_URL_PERFORM("Perform"); { LLFastTimer t(FTM_URL_PERFORM); if(!mDetail->mCurlRequest->wait()) @@ -371,8 +372,6 @@ LLIOPipe::EStatus LLURLRequest::process_impl( { CURLcode result; - static LLFastTimer::DeclareTimer FTM_PROCESS_URL_REQUEST_GET_RESULT("Get Result"); - bool newmsg = false; { LLFastTimer t(FTM_PROCESS_URL_REQUEST_GET_RESULT); |