summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-04-23 11:05:53 -0700
committerMerov Linden <merov@lindenlab.com>2013-04-23 11:05:53 -0700
commita01233b684fd53398acd7624db6bb63d283936b2 (patch)
tree9f6624c49d164d6354c271fff2e6132b0e8ab920
parent54de43834c8b89e88db26441e5fe191547fb9e62 (diff)
parentfbd82229a02326e0edac6cf2f1a2c05a553f0c33 (diff)
Pull merge from lindenlab/viewer-chui
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_container.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml2
2 files changed, 2 insertions, 2 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 3e8c6c76cc..a56b90a29d 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -129,7 +129,7 @@
auto_resize="true"
user_resize="true"
name="messages_layout_panel"
- expanded_min_dim="232">
+ expanded_min_dim="183">
<panel_container
bottom="-1"
follows="all"
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 c0ed2e6a78..8da4213c65 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -222,7 +222,7 @@
default_tab_group="3"
tab_group="2"
name="right_part_holder"
- min_width="221">
+ min_width="172">
<layout_stack
animate="true"
default_tab_group="2"