summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-11-02 11:03:46 -0700
committerMerov Linden <merov@lindenlab.com>2012-11-02 11:03:46 -0700
commitb6ad7db0d61033425a4f65270731023afe74ecce (patch)
treeb749a2cce5fd511184e2d20180ca116255a5e7a2
parentef5121ffb309c0317a4eb478e9527d33441377c2 (diff)
parent4cb8f69c106aabf02331620438c764d1c22e9d93 (diff)
Pull merge Gil's changes
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml8
1 files changed, 5 insertions, 3 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 84fba0a3b3..a889eb7933 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -14,7 +14,7 @@
width="394"
can_resize="true"
can_tear_off="false"
- min_width="250"
+ min_width="340"
min_height="190"
positioning="relative">
<floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string>
@@ -157,7 +157,8 @@
min_width="115"
width="150"
height="310"
- auto_resize="false">
+ user_resize="true"
+ auto_resize="true">
</layout_panel>
<layout_panel
default_tab_group="3"
@@ -171,7 +172,8 @@
user_resize="true"
auto_resize="true"
visible="true"
- name="left_part_holder">
+ name="left_part_holder"
+ min_width="225">
<panel
name="trnsAndChat_panel"
follows="all"