diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-07-28 12:15:32 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-07-28 12:15:32 -0700 |
commit | 0b9327df241e1a5a4693c690810ce8c330e196ad (patch) | |
tree | 1bdff29f5e3de1764410a7bf706763d4a35ebe8b /indra/newview/llvoicevivox.cpp | |
parent | 75452dd7a8f9f51bf3fbcb871976168f80e0cae0 (diff) | |
parent | b8d5c8993d46dc5b24bc07f721115a174ff918c8 (diff) |
Merge
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
-rw-r--r-- | indra/newview/llvoicevivox.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index cd2bbad620..0db0010688 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -7049,6 +7049,8 @@ LLVivoxProtocolParser::~LLVivoxProtocolParser() XML_ParserFree(parser); } +static LLFastTimer::DeclareTimer FTM_VIVOX_PROCESS("Vivox Process"); + // virtual LLIOPipe::EStatus LLVivoxProtocolParser::process_impl( const LLChannelDescriptors& channels, @@ -7057,6 +7059,7 @@ LLIOPipe::EStatus LLVivoxProtocolParser::process_impl( LLSD& context, LLPumpIO* pump) { + LLFastTimer t(FTM_VIVOX_PROCESS); LLBufferStream istr(channels, buffer.get()); std::ostringstream ostr; while (istr.good()) |