diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-04-19 15:31:52 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-04-19 15:31:52 +0100 |
| commit | dad1c52ed1b60a10cb4cf95b6017ffe137c5fbd3 (patch) | |
| tree | 4dc0c24bf2b84fe36274732adea2627b3dd44efd /indra/newview/skins | |
| parent | 3f10caafc07b0d1a60d2b943684e87dec265f5bc (diff) | |
| parent | e9b613e8d4362412a03b8c141614553f902a24b3 (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.xml | 38 |
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 114b9a84e3..f5aaedad4f 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -33,6 +33,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" @@ -84,7 +87,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" @@ -101,6 +136,7 @@ name="leave_call_btn" width="100" /> </layout_panel> + </layout_stack> <layout_panel follows="all" layout="topleft" |