diff options
author | Igor Borovkov <iborovkov@productengine.com> | 2009-11-13 12:06:52 +0200 |
---|---|---|
committer | Igor Borovkov <iborovkov@productengine.com> | 2009-11-13 12:06:52 +0200 |
commit | 1db5d35447478a74ece447297289d76bfef8c48c (patch) | |
tree | db0b8f78344aee6ed21efd4444908c8c8d0fc7a5 /indra/newview/llscreenchannel.h | |
parent | 4d616fdfaebca4aedce84f5d694dcd495ac4222c (diff) | |
parent | 74d5a6605bac7ae76889ce3697fc8f59d982d675 (diff) |
merge
--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; |