Merge branch 'nat/cleanup-timers' into lua-timers.

2 files changed, 8 insertions, 8 deletions

diff --git a/indra/llui/llflashtimer.cpp b/indra/llui/llflashtimer.cpp
index 39793316f4..4a5b220008 100644
--- a/indra/llui/llflashtimer.cpp
+++ b/indra/llui/llflashtimer.cpp
@@ -31,11 +31,11 @@ LLFlashTimer::LLFlashTimer(callback_t cb, S32 count, F32 period)
 :	LLEventTimer(period),
 	mCallback(cb),
 	mCurrentTickCount(0),
-    mIsFlashingInProgress(false),
-    mIsCurrentlyHighlighted(false),
-    mUnset(false)
+	mIsFlashingInProgress(false),
+	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 db8d49f009..4a2088734d 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();