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

3 files changed, 6 insertions, 5 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;
diff --git a/indra/llui/llflashtimer.h b/indra/llui/llflashtimer.h
index 037e32ac50..988b577ed2 100644
--- a/indra/llui/llflashtimer.h
+++ b/indra/llui/llflashtimer.h
@@ -46,7 +46,7 @@ public:
     LLFlashTimer(callback_t cb = NULL, S32 count = 0, F32 period = 0.0);
     ~LLFlashTimer() {};
 
-    /*virtual*/ BOOL tick();
+    bool tick() override;
 
     void startFlashing();
     void stopFlashing();
diff --git a/indra/llui/lltextvalidate.cpp b/indra/llui/lltextvalidate.cpp
index 9e27ed6232..10b3be1c23 100644
--- a/indra/llui/lltextvalidate.cpp
+++ b/indra/llui/lltextvalidate.cpp
@@ -31,6 +31,7 @@
 #include "lltextvalidate.h"
 
 #include "llnotificationsutil.h"
+#include "lltimer.h"
 #include "lltrans.h"
 
 #include "llresmgr.h" // for LLLocale