diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-10 14:21:11 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-10 14:21:11 +0300 |
| commit | 0b2e17775f264ac88fb8f21184a7bfcd54ebe026 (patch) | |
| tree | 2d74aeee65b3251991545a341f7fd55538f0fa51 /indra/llcommon/llfasttimer_class.cpp | |
| parent | a61c8d2272ee709595655024d57a41bfa1ed5354 (diff) | |
| parent | 5f53ba9af70fac74d7f80393604a9f7c723be625 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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; |