diff options
author | Merov Linden <merov@lindenlab.com> | 2012-12-18 22:57:56 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-12-18 22:57:56 -0800 |
commit | 8adca4583ec95ac063f79990ac092998f24415b8 (patch) | |
tree | 5019732addb552d4efafb31792a48e364ab8c351 /indra/newview/llconversationview.h | |
parent | 138d4f5fcd4567c5d77230b6eadc21c246ceed59 (diff) |
CHUI-600 : WIP : Flash conversation item in different color than select and start flashing only when shown
Diffstat (limited to 'indra/newview/llconversationview.h')
-rwxr-xr-x | indra/newview/llconversationview.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h index 1e20fb8b7e..74443e1d88 100755 --- a/indra/newview/llconversationview.h +++ b/indra/newview/llconversationview.h @@ -58,6 +58,7 @@ protected: /*virtual*/ bool isHighlightAllowed(); /*virtual*/ bool isHighlightActive(); + /*virtual*/ bool isFlashing() { return mFlashStateOn; } LLFloaterIMContainer* mContainer; @@ -83,11 +84,12 @@ public: virtual void refresh(); - void setFlashState(bool flash_state); + /*virtual*/ void setFlashState(bool flash_state); private: void onCurrentVoiceSessionChanged(const LLUUID& session_id); + void startFlashing(); LLPanel* mItemPanel; LLPanel* mCallIconLayoutPanel; @@ -95,6 +97,7 @@ private: LLOutputMonitorCtrl* mSpeakingIndicator; LLFlashTimer* mFlashTimer; bool mFlashStateOn; + bool mFlashStarted; bool mCollapsedMode; bool mHasArrow; |