diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llcommon/lltimer.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/linden/indra/llcommon/lltimer.h b/linden/indra/llcommon/lltimer.h index 8a4bc76..91b93d6 100644 --- a/linden/indra/llcommon/lltimer.h +++ b/linden/indra/llcommon/lltimer.h | |||
@@ -87,11 +87,11 @@ public: | |||
87 | void setLastClockCount(U64 current_count); // Sets the timer so that the next elapsed call will be relative to this time | 87 | void setLastClockCount(U64 current_count); // Sets the timer so that the next elapsed call will be relative to this time |
88 | void setTimerExpirySec(F32 expiration); | 88 | void setTimerExpirySec(F32 expiration); |
89 | BOOL checkExpirationAndReset(F32 expiration); | 89 | BOOL checkExpirationAndReset(F32 expiration); |
90 | BOOL hasExpired(); | 90 | BOOL hasExpired() const; |
91 | F32 getElapsedTimeAndResetF32(); // Returns elapsed time in seconds with reset | 91 | F32 getElapsedTimeAndResetF32(); // Returns elapsed time in seconds with reset |
92 | F64 getElapsedTimeAndResetF64(); | 92 | F64 getElapsedTimeAndResetF64(); |
93 | 93 | ||
94 | F32 getRemainingTimeF32(); | 94 | F32 getRemainingTimeF32() const; |
95 | 95 | ||
96 | static BOOL knownBadTimer(); | 96 | static BOOL knownBadTimer(); |
97 | 97 | ||
@@ -112,12 +112,8 @@ U64 get_clock_count(); | |||
112 | F64 calc_clock_frequency(U32 msecs); | 112 | F64 calc_clock_frequency(U32 msecs); |
113 | void update_clock_frequencies(); | 113 | void update_clock_frequencies(); |
114 | 114 | ||
115 | |||
116 | // Sleep for milliseconds | 115 | // Sleep for milliseconds |
117 | void ms_sleep(long ms); | 116 | void ms_sleep(U32 ms); |
118 | |||
119 | // Yield | ||
120 | //void llyield(); // Yield your timeslice - not implemented yet for Mac, so commented out. | ||
121 | 117 | ||
122 | // Returns the correct UTC time in seconds, like time(NULL). | 118 | // Returns the correct UTC time in seconds, like time(NULL). |
123 | // Useful on the viewer, which may have its local clock set wrong. | 119 | // Useful on the viewer, which may have its local clock set wrong. |