diff options
| author | Richard Linden <none@none> | 2010-09-16 16:29:53 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-16 16:29:53 -0700 |
| commit | d2a0327b6e89ca678e50e58dd685ea80e4c51cb5 (patch) | |
| tree | 99a6b0958cbb10af7044e8f26f9253e87d89e9bb /indra/newview/llmediactrl.h | |
| parent | b24071ca8936035ff42cb361e42cac63593f695e (diff) | |
popup blocking notifications now handled in all web_browser instances, not just llfloatermediabrowser
Diffstat (limited to 'indra/newview/llmediactrl.h')
| -rw-r--r-- | indra/newview/llmediactrl.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 3ba2904003..7008fa893e 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -140,8 +140,9 @@ public: bool getDecoupleTextureSize() { return mDecoupleTextureSize; } void setTextureSize(S32 width, S32 height); - void setMediaID(const std::string& id) { mMediaID = id; } + void showNotification(boost::shared_ptr<class LLNotification> notify); + void hideNotification(); // over-rides virtual BOOL handleKeyHere( KEY key, MASK mask); @@ -164,6 +165,9 @@ 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; @@ -185,8 +189,8 @@ public: bool mDecoupleTextureSize; S32 mTextureWidth; S32 mTextureHeight; - std::string mMediaID; bool mClearCache; + boost::shared_ptr<class LLNotification> mCurNotification; }; #endif // LL_LLMediaCtrl_H |