summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-04-22 22:11:46 +0100
committerAimee Linden <aimee@lindenlab.com>2010-04-22 22:11:46 +0100
commit695a7488bbf43ad9f351aa8d9e2c5601fc2c9a21 (patch)
treeb27294314ff2dfe72f0c1c3d5244c44cb02e039c /indra/newview/skins
parent6837f660380d1d5ddff021e6c14273937ff11036 (diff)
parent095f7a2aa0e7aadd5c3f4403f967b1cf13a2b693 (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_voice_controls.xml38
1 files changed, 37 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 5b77f11d71..e7c5770a08 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -35,6 +35,9 @@
name="no_one_near">
No one near has voice enabled
</string>
+ <floater.string name="no_voice_font">
+ No Voice Effect
+ </floater.string>
<layout_stack
clip="false"
follows="all"
@@ -86,7 +89,39 @@
visible="true"
width="20" />
</layout_panel>
- <layout_panel
+ <layout_stack
+ clip="false"
+ auto_resize="false"
+ follows="left|right"
+ height="23"
+ layout="topleft"
+ left="10"
+ mouse_opaque="false"
+ name="voice_font_and_leave_call_stack"
+ orientation="horizontal"
+ width="263">
+ <layout_panel
+ auto_resize="false"
+ user_resize="false"
+ follows="top|left"
+ height="26"
+ visible="true"
+ layout="topleft"
+ name="voice_font_panel"
+ width="120">
+ <combo_box
+ follows="left|top"
+ height="23"
+ name="voice_font"
+ top_pad="0"
+ width="120">
+ <combo_box.item
+ label="No Voice Effect"
+ name="no_voice_font"
+ value="0" />
+ </combo_box>
+ </layout_panel>
+ <layout_panel
auto_resize="false"
user_resize="false"
follows="top|left"
@@ -103,6 +138,7 @@
name="leave_call_btn"
width="100" />
</layout_panel>
+ </layout_stack>
<layout_panel
follows="all"
layout="topleft"