diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-20 18:38:30 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-20 18:38:30 -0800 |
| commit | f26f9274771e3446990131c930591153b0bd3ae4 (patch) | |
| tree | 682e3789781bdddc30a10fa6de358108f05ab45a /indra/newview/skins/default | |
| parent | 090636f107a2d3ba3438a6690f36eac3ec257314 (diff) | |
| parent | 95380b0aaa635c18c03801048559ba811640bc02 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_container.xml | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index 3475c7da33..cbf1830093 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -3,9 +3,8 @@ can_close="true" can_minimize="true" can_resize="true" - height="230" + height="210" layout="topleft" - min_height="50" name="floater_im_box" help_topic="floater_im_box" save_rect="true" @@ -15,7 +14,7 @@ title="CONVERSATIONS" bottom="-50" right="-5" - width="500"> + width="450"> <string name="collapse_icon" value="Conv_toolbar_collapse"/> @@ -37,7 +36,6 @@ user_resize="true" name="conversations_layout_panel" min_dim="38" - width="225" expanded_min_dim="156"> <layout_stack animate="false" @@ -121,7 +119,6 @@ opaque="true" top_pad="0" left="5" - height="390" right="-1"/> </layout_panel> <layout_panel 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 4dbd52d05e..9e2132dc3b 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -206,7 +206,7 @@ auto_resize="true" visible="true" name="left_part_holder" - min_width="225"> + min_width="221"> <panel name="trnsAndChat_panel" follows="all" |