diff options
| author | Simon Linden <simon@lindenlab.com> | 2013-03-19 16:20:53 -0700 |
|---|---|---|
| committer | Simon Linden <simon@lindenlab.com> | 2013-03-19 16:20:53 -0700 |
| commit | d5561a1ada5cf171c8e281e910a7e989496c3705 (patch) | |
| tree | 456cbb2374242d5508cc13165c876cd0672f6cd0 /indra/llui/llbutton.h | |
| parent | a8245c51b9cd6fac1d26932dbb1fcf052f00da18 (diff) | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
Merge in viewer-beta to get CHUI code
Diffstat (limited to 'indra/llui/llbutton.h')
| -rw-r--r-- | indra/llui/llbutton.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index deaa0823c6..060db59a8a 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -30,6 +30,7 @@ #include "lluuid.h" #include "llbadgeowner.h" #include "llcontrol.h" +#include "llflashtimer.h" #include "lluictrl.h" #include "v4color.h" #include "llframetimer.h" @@ -133,6 +134,7 @@ public: Optional<bool> handle_right_mouse; + Optional<bool> button_flash_enable; Optional<S32> button_flash_count; Optional<F32> button_flash_rate; @@ -199,8 +201,9 @@ public: void setToggleState(BOOL b); void setHighlight(bool b); - void setFlashing( BOOL b ); + void setFlashing( bool b ); BOOL getFlashing() const { return mFlashing; } + LLFlashTimer* getFlashTimer() {return mFlashingTimer;} void setHAlign( LLFontGL::HAlign align ) { mHAlign = align; } LLFontGL::HAlign getHAlign() const { return mHAlign; } @@ -373,7 +376,8 @@ protected: bool mForcePressedState; bool mDisplayPressedState; - LLFrameTimer mFlashingTimer; + LLFrameTimer mFrameTimer; + LLFlashTimer * mFlashingTimer; bool mHandleRightMouse; }; |