Merge branch 'release/luau-scripting' into lua-ui-callbacks

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/llui/llflashtimer.cpp b/indra/llui/llflashtimer.cpp
index 2de05f04c5..2711e8088d 100644
--- a/indra/llui/llflashtimer.cpp
+++ b/indra/llui/llflashtimer.cpp
@@ -35,7 +35,7 @@ LLFlashTimer::LLFlashTimer(callback_t cb, S32 count, F32 period)
     mIsCurrentlyHighlighted(false),
     mUnset(false)
 {
-    mEventTimer.stop();
+    stop();
 
     // By default use settings from settings.xml to be able change them via Debug settings. See EXT-5973.
     // Due to Timer is implemented as derived class from EventTimer it is impossible to change period
@@ -53,7 +53,7 @@ void LLFlashTimer::unset()
     mCallback = NULL;
 }
 
-BOOL LLFlashTimer::tick()
+bool LLFlashTimer::tick()
 {
     mIsCurrentlyHighlighted = !mIsCurrentlyHighlighted;
 
@@ -74,12 +74,12 @@ void LLFlashTimer::startFlashing()
 {
     mIsFlashingInProgress = true;
     mIsCurrentlyHighlighted = true;
-    mEventTimer.start();
+    start();
 }
 
 void LLFlashTimer::stopFlashing()
 {
-    mEventTimer.stop();
+    stop();
     mIsFlashingInProgress = false;
     mIsCurrentlyHighlighted = false;
     mCurrentTickCount = 0;