diff options
| author | simon <none@none> | 2014-05-07 15:28:13 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-05-07 15:28:13 -0700 |
| commit | a5568f942b449e48cad71e92acd67eaa22dd5e5d (patch) | |
| tree | f266b99c9663fda8001cbde48aa5a6b1b9d7db68 /indra/llcommon/lldeadmantimer.cpp | |
| parent | 80a134ffcc68b277c10cc79dc9c7ca073148b41e (diff) | |
| parent | dc4c184696b308b8f60fa1dd751b35e22bd47d62 (diff) | |
Merge downstream version 3.7.8 code
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; |