diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-10 17:21:11 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-10 17:21:11 +0300 |
| commit | a797948a18d3f09244348526852524527f3f8e27 (patch) | |
| tree | 7531629b93a27e09e00cb4539385564566a48a08 /indra/llcommon/llfasttimer_class.cpp | |
| parent | 591aa0d5be809a8ce0ba314493a9c3a8dfee8b9b (diff) | |
| parent | ac9543be9eb6e3c4b929142d0d2758ebf1885ac8 (diff) | |
merge
--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; |