diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-05-10 12:51:40 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-10 12:51:40 +0100 |
| commit | 1cb1e3d16f322168395b4bb91985d7581110c379 (patch) | |
| tree | d72d2ba67a27cabf3c364ee460f8c575dcabfd9f /indra/newview/skins | |
| parent | 8e1dbbbb5628eee210a0a7c25f32287d7b754a8b (diff) | |
| parent | 79a8d839aadc56fc3566c21ccd437f8f675723c8 (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_voice_controls.xml | 53 |
1 files changed, 34 insertions, 19 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..83380577ca 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -3,7 +3,7 @@ can_resize="true" can_minimize="true" can_close="false" - height="202" + height="205" layout="topleft" min_height="124" min_width="190" @@ -50,7 +50,7 @@ user_resize="false" auto_resize="false" layout="topleft" - height="26" + height="20" name="my_panel"> <avatar_icon enabled="false" @@ -86,23 +86,38 @@ visible="true" width="20" /> </layout_panel> - <layout_panel - auto_resize="false" - user_resize="false" - follows="top|left" - height="26" - visible="true" - layout="topleft" - name="leave_call_btn_panel" - width="100"> - <button - follows="right|top" - height="23" - top_pad="0" - label="Leave Call" - name="leave_call_btn" - width="100" /> - </layout_panel> + <layout_stack + clip="true" + auto_resize="false" + follows="left|top|right" + height="26" + layout="topleft" + mouse_opaque="false" + name="voice_font_and_leave_call_stack" + orientation="horizontal" + width="262"> + <panel + class="panel_voice_font" + name="panel_voice_font" + visiblity_control="VoiceFontUI" + filename="panel_voice_font.xml" /> + <layout_panel + auto_resize="false" + user_resize="false" + follows="top|right" + height="23" + visible="true" + layout="topleft" + name="leave_call_btn_panel" + width="100"> + <button + follows="right|top" + height="23" + label="Leave Call" + name="leave_call_btn" + width="100" /> + </layout_panel> + </layout_stack> <layout_panel follows="all" layout="topleft" |