diff options
Diffstat (limited to 'linden/indra/newview/skins/default/xui')
3 files changed, 14 insertions, 6 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml index ee9695e..c6e75fc 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml | |||
@@ -49,6 +49,14 @@ | |||
49 | image_selected="icn_speaker-muted_dark.tga" | 49 | image_selected="icn_speaker-muted_dark.tga" |
50 | image_unselected="icn_speaker_dark.tga" label="" label_width="55" | 50 | image_unselected="icn_speaker_dark.tga" label="" label_width="55" |
51 | left="150" name="mute_wind" tab_stop="false" toggle="true" width="25" /> | 51 | left="150" name="mute_wind" tab_stop="false" toggle="true" width="25" /> |
52 | <slider bottom_delta="-20" control_name="AudioLevelGestures" follows="left|top|right" | ||
53 | height="15" increment="0.05" initial_val="0.5" label="Gestures:" | ||
54 | label_width="55" left="10" max_val="1" min_val="0" name="Gestures" | ||
55 | show_text="false" volume="true" width="180" /> | ||
56 | <button bottom_delta="0" control_name="MuteGestures" follows="top|right" height="16" | ||
57 | image_selected="icn_speaker-muted_dark.tga" | ||
58 | image_unselected="icn_speaker_dark.tga" label="" label_width="55" | ||
59 | left="150" name="mute_gestures" tab_stop="false" toggle="true" width="25" /> | ||
52 | <slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right" | 60 | <slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right" |
53 | height="15" increment="0.05" initial_val="0.5" label="Interface:" label_width="55" | 61 | height="15" increment="0.05" initial_val="0.5" label="Interface:" label_width="55" |
54 | left="10" max_val="1" min_val="0" name="UI Volume" show_text="false" | 62 | left="10" max_val="1" min_val="0" name="UI Volume" show_text="false" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml index 7266536..3fdea5e 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml | |||
@@ -2,8 +2,8 @@ | |||
2 | <panel bg_visible="false" border="false" border_visible="false" bottom="1" | 2 | <panel bg_visible="false" border="false" border_visible="false" bottom="1" |
3 | follows="right|bottom" height="185" left="0" name="media_remote" | 3 | follows="right|bottom" height="185" left="0" name="media_remote" |
4 | use_bounding_rect="true" width="220"> | 4 | use_bounding_rect="true" width="220"> |
5 | <panel bottom="0" filename="panel_bg_tab.xml" height="187" left="0" width="220" /> | 5 | <panel bottom="0" filename="panel_bg_tab.xml" height="197" left="0" width="220" /> |
6 | <panel border="false" bottom="22" filename="panel_audio.xml" height="160" | 6 | <panel border="false" bottom="22" filename="panel_audio.xml" height="174" |
7 | label="Audio & Video" name="Volume Panel" width="220" /> | 7 | label="Audio & Video" name="Volume Panel" width="220" /> |
8 | <panel bottom_delta="-10" filename="panel_media_controls.xml" left="0" /> | 8 | <panel bottom_delta="-10" filename="panel_media_controls.xml" left="0" /> |
9 | <string name="play_label"> | 9 | <string name="play_label"> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml index 400da56..c6bb938 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml | |||
@@ -20,10 +20,10 @@ | |||
20 | mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128"> | 20 | mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128"> |
21 | Audio: | 21 | Audio: |
22 | </text> | 22 | </text> |
23 | <panel border="true" bottom="-195" enabled="true" filename="panel_audio.xml" | 23 | <panel border="true" bottom="-187" enabled="true" filename="panel_audio.xml" |
24 | follows="left|top|right|bottom" height="180" label="Volume" left="148" | 24 | follows="left|top|right|bottom" height="180" label="Volume" left="148" |
25 | mouse_opaque="true" name="Volume Panel" width="260" /> | 25 | mouse_opaque="true" name="Volume Panel" width="260" /> |
26 | <check_box bottom="-195" control_name="AudioStreamingMusic" enabled="true" | 26 | <check_box bottom="-205" control_name="AudioStreamingMusic" enabled="true" |
27 | follows="left|top" font="SansSerifSmall" height="16" initial_value="true" | 27 | follows="left|top" font="SansSerifSmall" height="16" initial_value="true" |
28 | label="Play streaming music when available (uses more bandwidth)" | 28 | label="Play streaming music when available (uses more bandwidth)" |
29 | left="142" mouse_opaque="true" name="streaming_music" radio_style="false" | 29 | left="142" mouse_opaque="true" name="streaming_music" radio_style="false" |
@@ -42,7 +42,7 @@ | |||
42 | initial_value="true" label="Automatically play media" left="162" | 42 | initial_value="true" label="Automatically play media" left="162" |
43 | mouse_opaque="true" name="auto_streaming_video" radio_style="false" | 43 | mouse_opaque="true" name="auto_streaming_video" radio_style="false" |
44 | width="338" /> | 44 | width="338" /> |
45 | <check_box bottom_delta="-34" control_name="MuteWhenMinimized" enabled="true" | 45 | <check_box bottom_delta="-27" control_name="MuteWhenMinimized" enabled="true" |
46 | follows="left|top" font="SansSerifSmall" height="16" initial_value="true" | 46 | follows="left|top" font="SansSerifSmall" height="16" initial_value="true" |
47 | label="Mute audio when window minimized" left="142" mouse_opaque="true" | 47 | label="Mute audio when window minimized" left="142" mouse_opaque="true" |
48 | name="mute_when_minimized" radio_style="false" width="215" /> | 48 | name="mute_when_minimized" radio_style="false" width="215" /> |
@@ -57,7 +57,7 @@ | |||
57 | label_width="158" left="148" max_val="10000" min_val="0" | 57 | label_width="158" left="148" max_val="10000" min_val="0" |
58 | mouse_opaque="true" name="Health change threshold" width="212" /> | 58 | mouse_opaque="true" name="Health change threshold" width="212" /> |
59 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 59 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
60 | bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top" | 60 | bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top" |
61 | font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" | 61 | font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" |
62 | mouse_opaque="true" name="ambient_prefs_text" v_pad="0" width="128"> | 62 | mouse_opaque="true" name="ambient_prefs_text" v_pad="0" width="128"> |
63 | Ambient: | 63 | Ambient: |