diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-06-07 13:22:25 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-06-07 13:22:25 -0700 |
| commit | 6bafc3c3c9503dd05cf8a0a6ce64bca75285df58 (patch) | |
| tree | 5a79beb89265a79a6297b2389e4a860a88cbfbbe /indra/llcommon/llfasttimer_class.cpp | |
| parent | 085b2c24f9ded3d0e9a33500a287aaa53e8b7fba (diff) | |
| parent | 09e1f88cc6a7dc0f52ad9d620a27cd54b4af021c (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-release
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; |