diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-05-03 17:14:46 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-05-03 17:14:46 -0700 |
| commit | ab6d50440714b18d8d0811c9f2cc652c971e9b9d (patch) | |
| tree | 80b1424d2cbb89bb207aaae44a9f04a83f06b77f /indra/llcommon/llfasttimer_class.cpp | |
| parent | 8daf25b65c30f58889ed5923d43bf785cb758026 (diff) | |
| parent | 1aef4820a5c95dec0cec7ad06bf1eb54f9c2ae32 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
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; |