diff options
| author | palange <palange@lindenlab.com> | 2010-05-28 11:32:12 -0700 |
|---|---|---|
| committer | palange <palange@lindenlab.com> | 2010-05-28 11:32:12 -0700 |
| commit | e167b8b171b3746c33bc3856438ad2dca15c85d2 (patch) | |
| tree | cccaf85546e343144660d8bd76c3bb8097d2b3c2 /indra/llcommon/llfasttimer_class.cpp | |
| parent | b7bfc3ae7a7934676b217e0c1fe24ce821ab4649 (diff) | |
| parent | 88d7073593ccf590d7b2b8e69c58c89029f8466e (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/llcommon/llfasttimer_class.cpp')
| -rw-r--r-- | indra/llcommon/llfasttimer_class.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index f39a4e6619..20727dd76e 100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp @@ -238,7 +238,7 @@ U64 LLFastTimer::countsPerSecond() // counts per second for the *32-bit* timer #else // windows or x86-mac or x86-linux or x86-solaris U64 LLFastTimer::countsPerSecond() // counts per second for the *32-bit* timer { - static U64 sCPUClockFrequency = U64(CProcessor().GetCPUFrequency(50)); + static U64 sCPUClockFrequency = U64(LLProcessorInfo().getCPUFrequency()); // we drop the low-order byte in our timers, so report a lower frequency return sCPUClockFrequency >> 8; |