merge

1 files changed, 7 insertions, 3 deletions

diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index 54d50ce4d0..b8e10d5591 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -108,7 +108,7 @@ public:
 
 		void setHomePageUrl( const std::string& urlIn, const std::string& mime_type = LLStringUtil::null );
 		std::string getHomePageUrl();
-		
+
 		void setTarget(const std::string& target);
 
 		// set/clear URL to visit when a 404 page is reached
@@ -142,8 +142,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);
@@ -166,6 +167,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;
@@ -188,8 +192,8 @@ public:
 		bool mDecoupleTextureSize;
 		S32 mTextureWidth;
 		S32 mTextureHeight;
-		std::string mMediaID;
 		bool mClearCache;
+		boost::shared_ptr<class LLNotification> mCurNotification;
 };
 
 #endif // LL_LLMediaCtrl_H