diff options
author | Sergey Borushevsky <sborushevsky@productengine.com> | 2009-11-03 14:54:43 +0200 |
---|---|---|
committer | Sergey Borushevsky <sborushevsky@productengine.com> | 2009-11-03 14:54:43 +0200 |
commit | a7d82c0d0e02f53929e5a5574f6efcb7db91b5af (patch) | |
tree | e56793858cbcb4f6b62fdba67348d0b4b6855e2e /indra/newview | |
parent | 37742cbbf242abcd9f70a8a179ec740e6867e121 (diff) |
Temporary fix for normal task EXT-1510 (Implement left side sticking control panels for IM floaters)
Disabled resizing of left side control panel to not occupy space for chat history on the right side.
Changed follows properties for icon and buttons in panel_im_control_panel, icon sticked to top, buttons to bottom.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_im_control_panel.xml | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index c314fce42d..c4324b425a 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -28,10 +28,10 @@ name="panel_im_control_panel" layout="topleft" top_delta="-3" - width="146" height="305" follows="left" label="IM Control Panel" + auto_resize="false" user_resize="false" /> <layout_panel height="305" width="200" 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 a9396661e0..04ee1a19cb 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 @@ -5,26 +5,31 @@ border="false"> <avatar_icon name="avatar_icon" + follows="left|top" width="96" height="96" /> <button name="view_profile_btn" + follows="left|bottom" label="View Profile" left_delta="3" width="125" height="20" /> <button name="add_friend_btn" + follows="left|bottom" label="Add Friend" width="125" height="20" /> <button name="call_btn" + follows="left|bottom" label="Call" width="125" height="20" /> <button + follows="left|bottom" height="20" label="End Call" name="end_call_btn" @@ -33,6 +38,7 @@ <button enabled="false" + follows="left|bottom" name="voice_ctrls_btn" label="Open Voice Controls" width="125" @@ -40,14 +46,17 @@ visible="false"/> <button name="teleport_btn" + follows="left|bottom" label="Teleport" width="125" height="20" /> <button name="share_btn" + follows="left|bottom" label="Share" width="125" height="20" /> <button name="pay_btn" + follows="left|bottom" label="Pay" width="125" height="20" /> |