From fdf80d2af35c5e2ce06f86f8710b470abf7ab387 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 23 Nov 2009 17:35:47 -0800
Subject: Fix for DEV-42997 404s result in blank page Also needs a tweak to
 LLQtWebKit that stops navigation to 404 URL specified in code if the URL is
 empty.

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

(limited to 'indra/newview')

diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 8c41133a3a..9dfdf3d5b1 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -169,6 +169,12 @@ public:
 			completeAny(status, "text/html");
 		}
 		else
+		if(status == 404)
+		{
+			// Treat 404s like an html page.
+			completeAny(status, "text/html");
+		}
+		else
 		{
 			llwarns << "responder failed with status " << status << ", reason " << reason << llendl;
 		
-- 
cgit v1.2.3


From d61ef312a2124bd09c499f5faaa1fe8b8b12510f Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Tue, 24 Nov 2009 09:34:04 -0800
Subject: DEV-41568 - implement parcel media controls in the nearby media
 floater Review #42

This implements the parcel media controls in the nearby media floater, including:
- Play, Pause, Stop, Volume, and Mute
- Correct update of the parcel media name
- Parcel Audio (which is currently broken, so I cannot test it)
---
 indra/newview/skins/default/xui/en/panel_prim_media_controls.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 88049fe7d1..0aa05bc0f9 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -417,8 +417,8 @@ function="MediaCtrl.CommitURL" />
 		height="22"
 		min_width="22"
 		width="22">
-	  <!-- Note: this isn't quite right either...the mute button is not the -->
-	  <!-- same as the others because it can't have the "image_overlay" be  -->
+	  <!-- Note: this is not quite right either...the mute button is not the -->
+	  <!-- same as the others because it cannot have the "image_overlay" be  -->
 	  <!-- two different images.  -->
 	  <button
 		  image_disabled="PushButton_Disabled"
@@ -439,7 +439,7 @@ function="MediaCtrl.CommitURL" />
 			function="MediaCtrl.ToggleMute" />
 	  </button>
 	</layout_panel>
-	<!-- We don't have a design yet for "volume", so this is a temporary -->
+	<!-- We do not have a design yet for "volume", so this is a temporary -->
 	<!-- solution.  See DEV-42827. -->
 	<layout_panel
 		name="volume_up"
-- 
cgit v1.2.3