diff options
| author | McCabe Maxsted | 2009-09-17 00:52:17 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-17 00:52:17 -0700 |
| commit | f4c717d32135460f0fe07a77643f974dcc4f143d (patch) | |
| tree | c49d4d68be0fa815589a0e2ed4c07466c638cce4 /linden/indra/newview/skins/default/xui | |
| parent | Applied patch by Aleric Inglewood for VWR-13996 - avatars using 1.22 complete... (diff) | |
| parent | Fixed stream info not updating (diff) | |
| download | meta-impy-f4c717d32135460f0fe07a77643f974dcc4f143d.zip meta-impy-f4c717d32135460f0fe07a77643f974dcc4f143d.tar.gz meta-impy-f4c717d32135460f0fe07a77643f974dcc4f143d.tar.bz2 meta-impy-f4c717d32135460f0fe07a77643f974dcc4f143d.tar.xz | |
Merge branch '1.2.0-streaminfo' into 1.2.0-next
Diffstat (limited to 'linden/indra/newview/skins/default/xui')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml | 6 |
1 files changed, 5 insertions, 1 deletions
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 92978ab..c960d36 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 | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | Streaming Preferences: | 15 | Streaming Preferences: |
| 16 | </text> | 16 | </text> |
| 17 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 17 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
| 18 | bottom="-280" drop_shadow_visible="true" enabled="true" follows="left|top" | 18 | bottom="-300" drop_shadow_visible="true" enabled="true" follows="left|top" |
| 19 | font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" | 19 | font="SansSerifSmall" h_pad="0" halign="left" height="12" left="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 Preferences: | 21 | Audio Preferences: |
| @@ -28,6 +28,10 @@ | |||
| 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" |
| 30 | width="339" /> | 30 | width="339" /> |
| 31 | <check_box bottom_delta="-20" control_name="ShowStreamTitle" enabled="true" | ||
| 32 | follows="left|top" font="SansSerifSmall" height="16" initial_value="true" | ||
| 33 | label="Show stream info in chat" left="162" mouse_opaque="true" | ||
| 34 | name="show_stream_title" radio_style="false" width="338" /> | ||
| 31 | <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true" | 35 | <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true" |
| 32 | follows="left|top" font="SansSerifSmall" height="16" initial_value="true" | 36 | follows="left|top" font="SansSerifSmall" height="16" initial_value="true" |
| 33 | label="Play Streaming Media When Available (uses more bandwidth)" | 37 | label="Play Streaming Media When Available (uses more bandwidth)" |