diff options
| author | Callum Prentice <callum@gmail.com> | 2020-10-14 13:47:26 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-10-14 13:47:26 -0700 |
| commit | 1cdcc00319c87b9be6ed677e4b36b0b53a1acb3e (patch) | |
| tree | e056d5af138131e577ba91428db3069007847a7d /indra/llui/llbutton.h | |
| parent | a350009614c0840e5535d5c7d2281ecb3104642d (diff) | |
| parent | a2c8c8238cfb109e0da81363995e08e99173426f (diff) | |
Mostly automatic merge with canonical viewer after release
Diffstat (limited to 'indra/llui/llbutton.h')
| -rw-r--r-- | indra/llui/llbutton.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index 7629ed1fea..572d36996c 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -205,6 +205,7 @@ public: void setFlashing( bool b, bool force_flashing = false ); BOOL getFlashing() const { return mFlashing; } LLFlashTimer* getFlashTimer() {return mFlashingTimer;} + void setFlashColor(const LLUIColor &color) { mFlashBgColor = color; }; void setHAlign( LLFontGL::HAlign align ) { mHAlign = align; } LLFontGL::HAlign getHAlign() const { return mHAlign; } |