diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-13 12:59:04 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-13 12:59:04 +0200 |
commit | a569421eca9efb9eb796a1322a961b6aac05cc27 (patch) | |
tree | b8675b965c81413155fb26e36ad5a81b6877cd4a /indra/newview/llscreenchannel.h | |
parent | bed508f9ef3bce8fb67669ab60b01cd4119a7f76 (diff) | |
parent | eb1484a0c9b6a075c900371cc5d7e8c4c0a4f93f (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; |