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.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

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

diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 9493fddf50..24038d0ee6 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -501,22 +501,6 @@ bool LLMediaCtrl::canNavigateForward()
 		return false;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLMediaCtrl::set404RedirectUrl( std::string redirect_url )
-{
-	if(mMediaSource && mMediaSource->hasMedia())
-		mMediaSource->getMediaPlugin()->set_status_redirect( 404, redirect_url );
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLMediaCtrl::clr404RedirectUrl()
-{
-	if(mMediaSource && mMediaSource->hasMedia())
-		mMediaSource->getMediaPlugin()->set_status_redirect(404, "");
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 void LLMediaCtrl::clearCache()
-- 
cgit v1.2.3


From efc57ea349d634d2bef1a554a925bea60f26f307 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 17 Mar 2011 18:50:44 -0700
Subject: Fix for Mac specific compiler error. All enumerants of an enum have
 to be present in a switch statement if there is no default.

---
 indra/newview/llmediactrl.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 24038d0ee6..376e38ade3 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -960,6 +960,12 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
 		};
 		break;
 
+		case MEDIA_EVENT_NAVIGATE_ERROR_PAGE:
+		{
+			LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_NAVIGATE_ERROR_PAGE" << LL_ENDL;
+		};
+		break;
+
 		case MEDIA_EVENT_CLICK_LINK_HREF:
 		{
 			LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_CLICK_LINK_HREF, target is \"" << self->getClickTarget() << "\", uri is " << self->getClickURL() << LL_ENDL;
-- 
cgit v1.2.3