diff options
| author | Richard Linden <none@none> | 2014-02-24 18:45:59 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-02-24 18:45:59 -0800 |
| commit | 80b4a4a1f54dccb814b5486423bf6492b3ae58a7 (patch) | |
| tree | f17c7a9b433e443b2f30251dd15b1bf50d4f803c /indra/llcommon/lldeadmantimer.cpp | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
| parent | ef591d280eb3c5bae7da20540ad4cbb30858d0aa (diff) | |
merge with release
Diffstat (limited to 'indra/llcommon/lldeadmantimer.cpp')
| -rw-r--r-- | indra/llcommon/lldeadmantimer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/lldeadmantimer.cpp b/indra/llcommon/lldeadmantimer.cpp index 7d9097e344..830443b956 100644 --- a/indra/llcommon/lldeadmantimer.cpp +++ b/indra/llcommon/lldeadmantimer.cpp @@ -43,7 +43,7 @@ // true true Not allowed // LLDeadmanTimer::LLDeadmanTimer(F64 horizon, bool inc_cpu) - : mHorizon(time_type(llmax(horizon, F64(0.0)) * gClockFrequency)), + : mHorizon(time_type(llmax(horizon, F64(0.0)) * get_timer_info().mClockFrequency)), mActive(false), // If true, a timer is running. mDone(false), // If true, timer has completed and can be read (once) mStarted(U64L(0)), @@ -144,8 +144,8 @@ bool LLDeadmanTimer::isExpired(time_type now, F64 & started, F64 & stopped, U64 return false; } - started = mStarted * gClockFrequencyInv; - stopped = mStopped * gClockFrequencyInv; + started = mStarted * get_timer_info().mClockFrequencyInv; + stopped = mStopped * get_timer_info().mClockFrequencyInv; count = mCount; mDone = false; |