diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 16:01:54 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 16:01:54 -0800 |
| commit | f23e0ffdb2ff2ad43a996c489b08c1324d9e5ee1 (patch) | |
| tree | e5219901b9edc82f78a530219707f5859ccb54fc /indra/llui/llflashtimer.h | |
| parent | b76123589381a2f59b704e8850792f9dcdc62517 (diff) | |
| parent | edeeed95416be2679e1ad3d29bab5396dbcccaa2 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/llui/llflashtimer.h')
| -rw-r--r-- | indra/llui/llflashtimer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llflashtimer.h b/indra/llui/llflashtimer.h index 2ef6ebcc8a..538ee0fcca 100644 --- a/indra/llui/llflashtimer.h +++ b/indra/llui/llflashtimer.h @@ -50,8 +50,8 @@ public: void startFlashing(); void stopFlashing(); - bool isFlashing() {return mIsFlashing;} - bool isHighlight() {return mIsHighlight;} + bool isFlashingInProgress() {return mIsFlashingInProgress;} + bool isCurrentlyHighlighted() {return mIsCurrentlyHighlighted;} private: callback_t mCallback; @@ -60,8 +60,8 @@ private: */ S32 mFlashCount; S32 mCurrentTickCount; - bool mIsHighlight; - bool mIsFlashing; + bool mIsCurrentlyHighlighted; + bool mIsFlashingInProgress; }; #endif /* LL_FLASHTIMER_H */ |