diff options
| author | palange <palange@lindenlab.com> | 2010-05-28 12:14:54 -0700 |
|---|---|---|
| committer | palange <palange@lindenlab.com> | 2010-05-28 12:14:54 -0700 |
| commit | 5605ad1b9d2ea18fb5e3510f9eed972bcb12961b (patch) | |
| tree | 8c2c5c9d651d836eeddda994a23e804264e22dfe /indra/llcommon/llfasttimer_class.cpp | |
| parent | a5c9e30fc806cc8cf291b7da0fd4133ca8241fed (diff) | |
| parent | e167b8b171b3746c33bc3856438ad2dca15c85d2 (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; |