diff options
author | Richard Linden <none@none> | 2013-09-07 21:54:03 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-09-07 21:54:03 -0700 |
commit | c6b6ae7a45f7ab473dd839515a1717bae68af03a (patch) | |
tree | 74bc548852a9ea3cf350096b55182761362a3f6d /indra/llmessage/lltemplatemessagereader.cpp | |
parent | 3fd68662f267a3fd96d101834b3a9563bde3f61e (diff) | |
parent | e4cacda5a0cf3918bdc8091997b988235e9d4f3d (diff) |
merge
Diffstat (limited to 'indra/llmessage/lltemplatemessagereader.cpp')
-rwxr-xr-x | indra/llmessage/lltemplatemessagereader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp index f160f60f30..90263ff074 100755 --- a/indra/llmessage/lltemplatemessagereader.cpp +++ b/indra/llmessage/lltemplatemessagereader.cpp @@ -525,7 +525,7 @@ void LLTemplateMessageReader::logRanOffEndOfPacket( const LLHost& host, const S3 gMessageSystem->callExceptionFunc(MX_RAN_OFF_END_OF_PACKET); } -static LLFastTimer::DeclareTimer FTM_PROCESS_MESSAGES("Process Messages"); +static LLTrace::TimeBlock FTM_PROCESS_MESSAGES("Process Messages"); // decode a given message BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender ) @@ -705,7 +705,7 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender } { - LLFastTimer t(FTM_PROCESS_MESSAGES); + LL_RECORD_BLOCK_TIME(FTM_PROCESS_MESSAGES); if( !mCurrentRMessageTemplate->callHandlerFunc(gMessageSystem) ) { LL_WARNS() << "Message from " << sender << " with no handler function received: " << mCurrentRMessageTemplate->mName << LL_ENDL; |