diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-21 13:10:28 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-21 13:10:28 -0500 |
| commit | 65d82fe192bdb4eb27766cf02eadaf78012f2817 (patch) | |
| tree | 6b466c2a84a551fb3fcfeffbd99bf6b20004bfdb /indra/newview/llvoicevivox.cpp | |
| parent | aaecc4c53ccbb71628988b10159f403d51836514 (diff) | |
SH-2031 Fix for stall in "Cleanup"
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 9dc6b5194e..0db0010688 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -7049,7 +7049,7 @@ LLVivoxProtocolParser::~LLVivoxProtocolParser() XML_ParserFree(parser); } -//static LLFastTimer::DeclareTimer FTM_VIVOX_PROCESS("Vivox Process"); +static LLFastTimer::DeclareTimer FTM_VIVOX_PROCESS("Vivox Process"); // virtual LLIOPipe::EStatus LLVivoxProtocolParser::process_impl( @@ -7059,7 +7059,7 @@ LLIOPipe::EStatus LLVivoxProtocolParser::process_impl( LLSD& context, LLPumpIO* pump) { - //LLFastTimer t(FTM_VIVOX_PROCESS); + LLFastTimer t(FTM_VIVOX_PROCESS); LLBufferStream istr(channels, buffer.get()); std::ostringstream ostr; while (istr.good()) |