CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single processor of...

CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single processor of different types of notifications): repaired LLFlashTimer

indra/llui/llflashtimer.cpp

@@ -34,6 +34,7 @@ LLFlashTimer::LLFlashTimer(callback_t cb, S32 count, F32 period)
 		, mCallback(cb)
 		, mCurrentTickCount(0)
         , mIsFlashingInProgress(false)
+        , mIsCurrentlyHighlighted(false)
 {
 	mEventTimer.stop();
 
@@ -58,9 +59,7 @@ BOOL LLFlashTimer::tick()
 
 	if (++mCurrentTickCount >= mFlashCount)
 	{
-		mEventTimer.stop();
-		mCurrentTickCount = 0;
-		mIsFlashingInProgress = false;
+		stopFlashing();
 	}
 
 	return FALSE;
@@ -69,14 +68,26 @@ BOOL LLFlashTimer::tick()
 void LLFlashTimer::startFlashing()
 {
 	mIsFlashingInProgress = true;
+	mIsCurrentlyHighlighted = true;
 	mEventTimer.start();
 }
 
 void LLFlashTimer::stopFlashing()
 {
+	mEventTimer.stop();
 	mIsFlashingInProgress = false;
 	mIsCurrentlyHighlighted = false;
-	mEventTimer.stop();
+	mCurrentTickCount = 0;
+}
+
+bool LLFlashTimer::isFlashingInProgress()
+{
+	return mIsFlashingInProgress;
+}
+
+bool LLFlashTimer::isCurrentlyHighlighted()
+{
+	return mIsCurrentlyHighlighted;
 }
 
 

indra/llui/llflashtimer.h

@@ -50,8 +50,8 @@ class LLFlashTimer : public LLEventTimer
 	void startFlashing();
 	void stopFlashing();
 
-	bool isFlashingInProgress() {return mIsFlashingInProgress;}
-	bool isCurrentlyHighlighted() {return mIsCurrentlyHighlighted;}
+	bool isFlashingInProgress();
+	bool isCurrentlyHighlighted();
 
 private:
 	callback_t		mCallback;