diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-08-31 13:47:47 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-08-31 13:47:47 -0700 |
| commit | 30ff6cabd61f2f083df5df1e6e70cc94742af477 (patch) | |
| tree | 631935f1cf59d19a91cdad65e9a75fe825afda7d /indra/llmessage/llpumpio.cpp | |
| parent | ff11d74820c89822cd067b51727d9df1dc87d0d0 (diff) | |
| parent | 3ac3a4b206c08ed06b889bdaa24074b6aa0e020a (diff) | |
Merge with trunk
Diffstat (limited to 'indra/llmessage/llpumpio.cpp')
| -rw-r--r-- | indra/llmessage/llpumpio.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp index 3e3f0b37a7..5e9dfd81fa 100644 --- a/indra/llmessage/llpumpio.cpp +++ b/indra/llmessage/llpumpio.cpp @@ -444,11 +444,13 @@ void LLPumpIO::pump() pump(DEFAULT_POLL_TIMEOUT); } +static LLFastTimer::DeclareTimer FTM_PUMP("Pump"); + //timeout is in microseconds void LLPumpIO::pump(const S32& poll_timeout) { LLMemType m1(LLMemType::MTYPE_IO_PUMP); - LLFastTimer t1(LLFastTimer::FTM_PUMP); + LLFastTimer t1(FTM_PUMP); //llinfos << "LLPumpIO::pump()" << llendl; // Run any pending runners. |