diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-09-05 08:37:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-05 08:37:16 -0400 |
| commit | 7ac4c3b56e5246fceaa73e7c9c665d3c04827d6c (patch) | |
| tree | e96334bd9299102ebdaf229eec9cf4c2165f8c2f /indra/llcommon/llframetimer.cpp | |
| parent | 487973d3f0ee9b8583b3d977ca6a405cba5fe518 (diff) | |
| parent | 6a747e1ce027700a3609f4c377179bfa29c3ce31 (diff) | |
Merge pull request #2450 from secondlife/lua-merge
Merge updated 'main' branch into release/luau-scripting
Diffstat (limited to 'indra/llcommon/llframetimer.cpp')
| -rw-r--r-- | indra/llcommon/llframetimer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llcommon/llframetimer.cpp b/indra/llcommon/llframetimer.cpp index 2805662d6f..a0080b57bb 100644 --- a/indra/llcommon/llframetimer.cpp +++ b/indra/llcommon/llframetimer.cpp @@ -52,12 +52,12 @@ void LLFrameTimer::updateFrameTime() void LLFrameTimer::start() { reset(); - mStarted = TRUE; + mStarted = true; } void LLFrameTimer::stop() { - mStarted = FALSE; + mStarted = false; } void LLFrameTimer::reset() @@ -84,14 +84,14 @@ void LLFrameTimer::pause() { if (mStarted) mStartTime = sFrameTime - mStartTime; // save dtime - mStarted = FALSE; + mStarted = false; } void LLFrameTimer::unpause() { if (!mStarted) mStartTime = sFrameTime - mStartTime; // restore dtime - mStarted = TRUE; + mStarted = true; } void LLFrameTimer::setTimerExpirySec(F32 expiration) @@ -112,7 +112,7 @@ F64 LLFrameTimer::expiresAt() const return expires_at; } -BOOL LLFrameTimer::checkExpirationAndReset(F32 expiration) +bool LLFrameTimer::checkExpirationAndReset(F32 expiration) { //LL_INFOS() << "LLFrameTimer::checkExpirationAndReset()" << LL_ENDL; //LL_INFOS() << " mStartTime:" << mStartTime << LL_ENDL; @@ -123,9 +123,9 @@ BOOL LLFrameTimer::checkExpirationAndReset(F32 expiration) { reset(); setTimerExpirySec(expiration); - return TRUE; + return true; } - return FALSE; + return false; } // static |