diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-12-15 10:14:58 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-12-15 10:14:58 +0000 |
| commit | f890a9399b0b7063594617fce6ce68b0c6ea3576 (patch) | |
| tree | 80960125fc0c0fccede8ab78215506758269e53e | |
| parent | a63531145d210a872072f20ee1f04d9504c6617c (diff) | |
EXT-3394 EXT-3297: Putting back the prefs volume slider.
Further discussions between Q and Joe resulted in the decision to keep
the master gain control in the sound prefs panel. Reverting to Lis'
original change, which should match exactly the state in viewer-2-0.
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 75 |
1 files changed, 74 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index 032721192d..d8e3f4ccfb 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -400,13 +400,86 @@ name="voice_input_device" top_pad="-2" width="200" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="165" + name="My volume label" + top_pad="5" + width="200"> + My volume: + </text> + <slider_bar + control_name="AudioLevelMic" + follows="left|top" + height="17" + increment="0.05" + initial_value="1.0" + layout="topleft" + left="160" + max_val="2" + name="mic_volume_slider" + tool_tip="Change the volume using this slider" + top_pad="-2" + width="220" /> + <text + type="string" + text_color="EmphasisColor" + length="1" + follows="left|top" + height="18" + layout="topleft" + left_pad="5" + name="wait_text" + top_delta="0" + width="110"> + Please wait + </text> + <locate + height="20" + layout="topleft" + left_delta="0" + name="bar0" + top_delta="0" + width="20" /> + <locate + height="20" + layout="topleft" + left_pad="2" + name="bar1" + top_delta="0" + width="20" /> + <locate + height="20" + layout="topleft" + left_pad="2" + name="bar2" + top_delta="0" + width="20" /> + <locate + height="20" + layout="topleft" + left_pad="2" + name="bar3" + top_delta="0" + width="20" /> + <locate + height="20" + layout="topleft" + left_pad="2" + name="bar4" + top_delta="0" + width="20" /> <icon height="18" image_name="Parcel_Voice_Light" left="80" name="speaker_icon" mouse_opaque="false" - top_pad="10" + top_pad="-8" visible="true" width="22" /> <text |