summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLis Pardi <lis@lindenlab.com>2009-12-14 18:02:07 -0500
committerLis Pardi <lis@lindenlab.com>2009-12-14 18:02:07 -0500
commitdaeef47ce111eb8f131dc8b7a2f6aca6226f7867 (patch)
tree58b478b48060cc90ecf1cf38439d173284d8266c /indra
parent861640adf90809131210175368850d0ccc1d669e (diff)
parent1c482362d070919fad787d7c90504a7c9681ccfd (diff)
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_sound.xml75
1 files changed, 1 insertions, 74 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 d8e3f4ccfb..032721192d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -400,86 +400,13 @@
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="-8"
+ top_pad="10"
visible="true"
width="22" />
<text