diff options
author | Igor Borovkov <iborovkov@productengine.com> | 2009-10-27 18:01:41 +0200 |
---|---|---|
committer | Igor Borovkov <iborovkov@productengine.com> | 2009-10-27 18:01:41 +0200 |
commit | 3eb7f84b10832d77d8765ea9550108c67c462bcb (patch) | |
tree | be0c065fa612d29cc1117f9eccd05a7560f405d4 /indra/newview/skins/default/xui/en | |
parent | 4309277c1bd063327cbd0cb1c9f3e276301d9fb7 (diff) |
IM: implemented task EXT-1905 (Add "Call" and "End Call" functionality to new IIM Floater)
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_control_panel.xml | 8 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_im_control_panel.xml | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml index 9767a673f6..e1f18d8b7d 100644 --- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml @@ -7,7 +7,7 @@ <avatar_list color="DkGray2" follows="left|top|right|bottom" - height="150" + height="130" layout="topleft" left="3" name="speakers_list" @@ -24,4 +24,10 @@ label="Call" width="90" height="20" /> + <button + name="end_call_btn" + label="End Call" + width="90" + height="20" + visible="false"/> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml index 7dc94d1141..dca52def49 100644 --- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="panel_im_control_panel" width="96" - height="215" + height="225" border="false"> <avatar_icon name="avatar_icon" @@ -24,6 +24,13 @@ width="90" height="20" /> + <button + height="20" + label="End Call" + name="end_call_btn" + visible="false" + width="90" /> + <button name="share_btn" label="Share" width="90" |