summaryrefslogtreecommitdiff
path: root/indra/llmessage/llioutil.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-09-05 14:21:57 -0700
committerRichard Linden <none@none>2013-09-05 14:21:57 -0700
commit9dc6478544711b1f03c9f7010421f9c8ebbbe008 (patch)
tree1d28248570ac6e48596c787734bc39a891d9752e /indra/llmessage/llioutil.cpp
parent736efc7b574635d5c86a97a33b456dd79a035777 (diff)
parentcbe397ad13665c7bc993e10d8fe1e4a876253378 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llmessage/llioutil.cpp')
-rwxr-xr-xindra/llmessage/llioutil.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llmessage/llioutil.cpp b/indra/llmessage/llioutil.cpp
index 9fd49d23d4..8ec93af33f 100755
--- a/indra/llmessage/llioutil.cpp
+++ b/indra/llmessage/llioutil.cpp
@@ -45,7 +45,7 @@ LLIOPipe::EStatus LLIOFlush::process_impl(
}
-static LLFastTimer::DeclareTimer FTM_PROCESS_SLEEP("IO Sleep");
+static LLTrace::TimeBlock FTM_PROCESS_SLEEP("IO Sleep");
/**
* @class LLIOSleep
*/
@@ -56,7 +56,7 @@ LLIOPipe::EStatus LLIOSleep::process_impl(
LLSD& context,
LLPumpIO* pump)
{
- LLFastTimer t(FTM_PROCESS_SLEEP);
+ LL_RECORD_BLOCK_TIME(FTM_PROCESS_SLEEP);
if(mSeconds > 0.0)
{
if(pump) pump->sleepChain(mSeconds);
@@ -66,7 +66,7 @@ LLIOPipe::EStatus LLIOSleep::process_impl(
return STATUS_DONE;
}
-static LLFastTimer::DeclareTimer FTM_PROCESS_ADD_CHAIN("Add Chain");
+static LLTrace::TimeBlock FTM_PROCESS_ADD_CHAIN("Add Chain");
/**
* @class LLIOAddChain
*/
@@ -77,7 +77,7 @@ LLIOPipe::EStatus LLIOAddChain::process_impl(
LLSD& context,
LLPumpIO* pump)
{
- LLFastTimer t(FTM_PROCESS_ADD_CHAIN);
+ LL_RECORD_BLOCK_TIME(FTM_PROCESS_ADD_CHAIN);
pump->addChain(mChain, mTimeout);
return STATUS_DONE;
}