summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/floater_im_container.xml
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-12-21 10:45:47 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-12-21 10:45:47 -0800
commited61957b39435db775445f7344cbf1252270eb74 (patch)
tree19007496e1a31c34b871878a24c10729ace72f32 /indra/newview/skins/default/xui/en/floater_im_container.xml
parent9ea83e76f67406755a3a1ca5a8ac1d544e157e43 (diff)
parent6df0377d1dd810cc1656c6c2664af2c7c87705fc (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_im_container.xml')
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_container.xml7
1 files changed, 2 insertions, 5 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