From 4619a1e58bd53307bf5b2e326d814eddad73fbb1 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 25 Feb 2011 15:13:21 -0800 Subject: SOCIAL-550 FIX Add back media volume and play/pause buttons to top bar SOCIAL-577 FIX create streamlined navigation bar --- indra/newview/app_settings/settings_minimal.xml | 73 --- indra/newview/skins/minimal/xui/en/main_view.xml | 9 + .../skins/minimal/xui/en/panel_navigation_bar.xml | 24 +- .../minimal/xui/en/panel_prim_media_controls.xml | 581 --------------------- .../skins/minimal/xui/en/panel_status_bar.xml | 62 +++ .../skins/minimal/xui/en/panel_volume_pulldown.xml | 34 ++ 6 files changed, 106 insertions(+), 677 deletions(-) delete mode 100644 indra/newview/skins/minimal/xui/en/panel_prim_media_controls.xml create mode 100644 indra/newview/skins/minimal/xui/en/panel_status_bar.xml create mode 100644 indra/newview/skins/minimal/xui/en/panel_volume_pulldown.xml diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 04712ec30b..3130c7802c 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -36,15 +36,6 @@ Value http://pdp48.lindenlab.com:8001/viewer/guide/ - DisableExternalBrowser - - Comment - Disable opening an external browser. - Type - Boolean - Value - 1 - EnableGrab Comment @@ -81,15 +72,6 @@ Value http://interest.secondlife.com/static/viewer/howto/index.html - LocalFileSystemBrowsingEnabled - - Comment - Enable/disable access to the local file system via the file picker - Type - Boolean - Value - 0 - PreferredMaturity Comment @@ -193,61 +175,6 @@ Value 1 - MediaControlFadeTime - - Comment - Amount of time (in seconds) that the media control fades - Persist - 1 - Type - F32 - Value - 0 - - MediaControlTimeout - - Comment - Amount of time (in seconds) for media controls to fade with no mouse activity - Persist - 1 - Type - F32 - Value - 0 - - MediaShowOutsideParcel - - Comment - Whether or not to show media from outside the current parcel - Persist - 1 - Type - Boolean - Value - 0 - - MediaShowWithinParcel - - Comment - Whether or not to show media within the current parcel - Persist - 1 - Type - Boolean - Value - 0 - - AudioStreamingMedia - - Comment - Enable streaming - Persist - 1 - Type - Boolean - Value - 0 - AvatarPickerHintTimeout Comment diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml index 2a3107398d..5906205636 100644 --- a/indra/newview/skins/minimal/xui/en/main_view.xml +++ b/indra/newview/skins/minimal/xui/en/main_view.xml @@ -176,6 +176,15 @@ width="1024"/> + - - - - Inspector_Background - 0.2 - 300 - 75 - 1.0 - 1.1 - 1.5 - 50 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://www.secondlife.com - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/minimal/xui/en/panel_status_bar.xml b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml new file mode 100644 index 0000000000..6ccd0e938d --- /dev/null +++ b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml @@ -0,0 +1,62 @@ + + + + Packet Loss + + + Bandwidth + + + [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt] + + + [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt] + + + L$ [AMT] + + +