diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-12 18:58:29 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-12 18:58:29 +0200 |
| commit | e7af49ce5d8313efa3d58cd90c2a67abd43fc822 (patch) | |
| tree | a255ad12c868898c7fac3947175a01b19299b354 /indra/newview/llscreenchannel.h | |
| parent | 381c9f468d9ff0d48b0e80430856251acfe17066 (diff) | |
| parent | 4c637196e4c511c7d199a66759671e16e9a7566b (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llscreenchannel.h')
| -rw-r--r-- | indra/newview/llscreenchannel.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h index fd31690622..f39b94b89d 100644 --- a/indra/newview/llscreenchannel.h +++ b/indra/newview/llscreenchannel.h @@ -93,9 +93,10 @@ public: // Channel's behavior-functions // set whether a channel will control hovering inside itself or not virtual void setControlHovering(bool control) { mControlHovering = control; } - // set Hovering flag for a channel - virtual void setHovering(bool hovering) { mIsHovering = hovering; } + + bool isHovering() { return mHoveredToast != NULL; } + void setCanStoreToasts(bool store) { mCanStoreToasts = store; } void setDisplayToastsAlways(bool display_toasts) { mDisplayToastsAlways = display_toasts; } @@ -117,7 +118,7 @@ public: protected: // Channel's flags bool mControlHovering; - bool mIsHovering; + LLToast* mHoveredToast; bool mCanStoreToasts; bool mDisplayToastsAlways; bool mOverflowToastHidden; |