From b3e444c74e0f31ba9d63d7bed934f017bf2499df Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 17 Mar 2011 17:18:58 -0700
Subject: SOCIAL-634 FIX Error condition content for Destination Guide, Avatar
 Picker, and Help if S3 content or web content is not available. (Included
 refs to new LLQtWebKit that supports functionality)

---
 indra/newview/llmediactrl.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'indra/newview/llmediactrl.h')

diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index 38a74f90d3..7a28b0986d 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -113,10 +113,6 @@ public:
 
 		void setTarget(const std::string& target);
 
-		// set/clear URL to visit when a 404 page is reached
-		void set404RedirectUrl( std::string redirect_url );
-		void clr404RedirectUrl();
-		
 		// Clear the browser cache when the instance gets loaded
 		void clearCache();
 
-- 
cgit v1.2.3


From a57729b9260ce5e711bff47c02ca54ab65eade27 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Tue, 22 Mar 2011 13:58:27 -0700
Subject: SOCIAL-634 FIX Error condition content for Destination Guide, Avatar
 Picker,             and Help if S3 content or web content is not available

---
 indra/newview/llmediactrl.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/llmediactrl.h')

diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index 7a28b0986d..53b98b7ec8 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -63,6 +63,7 @@ public:
 
 		Optional<std::string>	initial_mime_type;
 		Optional<std::string>	media_id;
+		Optional<std::string>	error_page_url;
 		
 		Params();
 	};
@@ -113,6 +114,9 @@ public:
 
 		void setTarget(const std::string& target);
 
+		void setErrorPageURL(const std::string& url);
+		const std::string& getErrorPageURL();
+
 		// Clear the browser cache when the instance gets loaded
 		void clearCache();
 
@@ -175,6 +179,7 @@ public:
 		std::string mHomePageUrl;
 		std::string mHomePageMimeType;
 		std::string mCurrentNavUrl;
+		std::string mErrorPageURL;
 		std::string mTarget;
 		bool mIgnoreUIScale;
 		bool mAlwaysRefresh;
-- 
cgit v1.2.3


From a5572505d843778b7f5395e25f9b9d15178bb423 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Mar 2011 19:37:00 -0700
Subject: SOCIAL-509 FIX There is no way to copy a user name from web profile
 with the mouse

---
 indra/newview/llmediactrl.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llmediactrl.h')

diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index 53b98b7ec8..28666e620f 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -34,6 +34,7 @@
 
 class LLViewBorder;
 class LLUICtrlFactory;
+class LLContextMenu;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -195,6 +196,7 @@ public:
 		bool mClearCache;
 		class LLWindowShade* mWindowShade;
 		bool mHoverTextChanged;
+		LLContextMenu* mContextMenu;
 };
 
 #endif // LL_LLMediaCtrl_H
-- 
cgit v1.2.3