diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-30 14:19:53 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-30 14:19:53 -0700 |
| commit | 68b62747edb7073dd3f4975e2b38388ae80d801c (patch) | |
| tree | 73730fdc31d3d74a2ba69ad156217299115cd810 /indra/llcommon/lldeadmantimer.cpp | |
| parent | a1afe50feb1c42cc21c7f89b4187a8f7abe0c9fc (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Pull merge from lindenlab/viewer-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; |