diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2008-05-14 21:37:13 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2008-05-14 21:37:13 +0000 |
| commit | e77de5d685ae441f72920f0e04d9887ee958745a (patch) | |
| tree | b3736831042b20be198dc9994ba68db1e8be2a14 /indra/llcommon/lltimer.h | |
| parent | 41e1ed5b4153019b07d97f54751db53fa248d8d4 (diff) | |
Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .
Passed QA as part of QAR-491.
Diffstat (limited to 'indra/llcommon/lltimer.h')
| -rw-r--r-- | indra/llcommon/lltimer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h index 113eb1e9e3..57f9e23e7a 100644 --- a/indra/llcommon/lltimer.h +++ b/indra/llcommon/lltimer.h @@ -87,11 +87,11 @@ public: void setLastClockCount(U64 current_count); // Sets the timer so that the next elapsed call will be relative to this time void setTimerExpirySec(F32 expiration); BOOL checkExpirationAndReset(F32 expiration); - BOOL hasExpired(); + BOOL hasExpired() const; F32 getElapsedTimeAndResetF32(); // Returns elapsed time in seconds with reset F64 getElapsedTimeAndResetF64(); - F32 getRemainingTimeF32(); + F32 getRemainingTimeF32() const; static BOOL knownBadTimer(); |