diff options
| author | palange <palange@lindenlab.com> | 2010-05-28 09:30:15 -0700 |
|---|---|---|
| committer | palange <palange@lindenlab.com> | 2010-05-28 09:30:15 -0700 |
| commit | c901048d98a68a992cf1945e5802ec34087f67bb (patch) | |
| tree | b16fc414b0591d11b1ebf71dc4f8ea250c6dab5e /indra/llcommon/llfasttimer_class.cpp | |
| parent | 7983de22074beb25a832f89aa3e7a9728baca328 (diff) | |
| parent | 5fb6f4fe93cd9e7a83d59cd23b53dd53cae5721a (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; |