summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfasttimer_class.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-13 12:44:45 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-13 12:44:45 +0100
commitd3418e5e65f7845f89b5ce2019bd635861573ed3 (patch)
treed56a1e629858cb89775c84c2a34b2282d29b2955 /indra/llcommon/llfasttimer_class.cpp
parent818e970b3efe65f6e471d071ae5f01603f61da79 (diff)
parentd50a34e6e37c34fb84ad232aad7b3bf2a3b3b408 (diff)
merge
Diffstat (limited to 'indra/llcommon/llfasttimer_class.cpp')
-rw-r--r--indra/llcommon/llfasttimer_class.cpp2
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;