diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-01-26 14:33:28 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-01-26 14:33:28 -0800 |
| commit | a87cbadf16cb8a32ea78fb605403472ee866bccf (patch) | |
| tree | 07b4eb3d31491ca30d02952442ce53b1cd426c55 /indra/llcommon/llfasttimer_class.cpp | |
| parent | 3f7ed7ef1de1012e3bea719e8042a256deb10ac3 (diff) | |
| parent | fee564c26e1018787cf70b95fc677c1da447118c (diff) | |
Merge
Diffstat (limited to 'indra/llcommon/llfasttimer_class.cpp')
| -rw-r--r-- | indra/llcommon/llfasttimer_class.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index abcaee673e..fae0a66873 100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp @@ -226,12 +226,12 @@ void LLFastTimer::DeclareTimer::updateCachedPointers() //static #if LL_LINUX || LL_SOLARIS || ( LL_DARWIN && !(defined(__i386__) || defined(__amd64__)) ) -U64 LLFastTimer::countsPerSecond() +U64 LLFastTimer::countsPerSecond() // counts per second for the *32-bit* timer { - return sClockResolution; + return sClockResolution >> 8; } #else // windows or x86-mac -U64 LLFastTimer::countsPerSecond() +U64 LLFastTimer::countsPerSecond() // counts per second for the *32-bit* timer { static U64 sCPUClockFrequency = U64(CProcessor().GetCPUFrequency(50)); |