diff options
author | Dave Parks <davep@lindenlab.com> | 2010-06-17 20:47:41 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-06-17 20:47:41 -0500 |
commit | cb50a2395bc37f1f7833171a976f67af9f2df66d (patch) | |
tree | 57822487f245e369fcc03b311256b3f398226a03 /indra/llcommon | |
parent | e90c1399bc859d828988905968167c179c32432b (diff) | |
parent | 9ed825fe5abd569e0e41016b19e3a040bfb09e7a (diff) |
merge
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/llfasttimer_class.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index 20727dd76e..dfbae09864 100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp @@ -238,7 +238,8 @@ 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(LLProcessorInfo().getCPUFrequency()); + //getCPUFrequency returns MHz and sCPUClockFrequency wants to be in Hz + static U64 sCPUClockFrequency = U64(LLProcessorInfo().getCPUFrequency()*1000000.0); // we drop the low-order byte in our timers, so report a lower frequency return sCPUClockFrequency >> 8; |