diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-24 11:04:32 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-24 11:04:32 -0800 |
| commit | 6d5aff5aecc5c537ea6d24a2f79afa1afa5f47a8 (patch) | |
| tree | 465303a4efda24a5515ce581f3af91d77a801d28 | |
| parent | f9081220accfe5c197f1c567af8806bde236f946 (diff) | |
| parent | b8a046f7d9a59c58b98fa981ae2e27e69f8c28b5 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_prim_media_controls.xml | 6 |
2 files changed, 9 insertions, 3 deletions
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; 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" |