diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-31 16:49:26 +0300 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-31 16:49:26 +0300 |
commit | 349bc84dfd73702fe788f9ac4539d8046b78e9f3 (patch) | |
tree | 4a0f772749ae4c21712fdb07eaabdb5b8a435a68 /indra/newview/skins/default/xui | |
parent | 0a0f6dec5f6128990f4116c1f90e19691e30c3d2 (diff) | |
parent | 8ef5fd0e144af53e6044c0dfc15fda9b36bdd85a (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_im_control_panel.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/text.xml | 1 |
2 files changed, 2 insertions, 1 deletions
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 88566ea037..7d7e21d4b0 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 @@ -16,7 +16,7 @@ border_size="0" clip="false" follows="all" - height="168" + height="183" layout="topleft" left="5" name="button_stack" diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 855584a0db..998ec5b170 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -15,6 +15,7 @@ bg_visible="false" border_visible="false" hover="false" + sound_flags="0" text_color="LabelTextColor" v_pad="0" max_length="4096"/> |