diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
| commit | 1034db639462d95e54e9bf9e4d63500b745bb0a2 (patch) | |
| tree | 68b010fb3f9f2c4b67e59187d125090b1c69d72f /indra/newview/llmediactrl.h | |
| parent | 0eb491417e8479516b07cc9237242b60d36d10f5 (diff) | |
| parent | eb0b8ab3ea19617a52881191bab21bfedcc5696d (diff) | |
merge changes for storm-806
Diffstat (limited to 'indra/newview/llmediactrl.h')
| -rw-r--r-- | indra/newview/llmediactrl.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 96bb0c1df5..38a74f90d3 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -90,6 +90,7 @@ public: virtual BOOL handleRightMouseUp(S32 x, S32 y, MASK mask); virtual BOOL handleDoubleClick( S32 x, S32 y, MASK mask ); virtual BOOL handleScrollWheel( S32 x, S32 y, S32 clicks ); + virtual BOOL handleToolTip(S32 x, S32 y, MASK mask); // navigation void navigateTo( std::string url_in, std::string mime_type = ""); @@ -168,9 +169,6 @@ public: private: void onVisibilityChange ( const LLSD& new_visibility ); void onPopup(const LLSD& notification, const LLSD& response); - void onCloseNotification(); - void onClickNotificationButton(const std::string& name); - void onClickIgnore(LLUICtrl* ctrl); const S32 mTextureDepthBytes; LLUUID mMediaTextureID; @@ -194,7 +192,8 @@ public: S32 mTextureWidth; S32 mTextureHeight; bool mClearCache; - boost::shared_ptr<class LLNotification> mCurNotification; + class LLWindowShade* mWindowShade; + bool mHoverTextChanged; }; #endif // LL_LLMediaCtrl_H |