summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2013-03-21 15:57:44 +0200
committerAlexanderP ProductEngine <apaschenko@productengine.com>2013-03-21 15:57:44 +0200
commit1df1ce7a31df77743675899d4a15458ac84a281a (patch)
treef02dddaf99695827ef877e3b5895ba20b8050bb6 /indra/newview/skins
parent4a2fb4c64f2079089b78202e53bbe1dbe8ac09c7 (diff)
CHUI-858 FIXED Text can be clipped by text input bar in message panel
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml12
1 files changed, 7 insertions, 5 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 e081ea8e74..1ad54bdb6b 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -266,6 +266,7 @@
left="0">
<layout_panel
auto_resize="false"
+ user_resize="false"
height="26"
layout="topleft"
left_delta="0"
@@ -285,7 +286,6 @@
width="230" />
</layout_panel>
<layout_panel
- height="233"
width="210"
layout="topleft"
follows="all"
@@ -293,19 +293,21 @@
top_delta="0"
bottom="0"
visible="true"
- user_resize="true"
+ user_resize="false"
auto_resize="true"
name="chat_holder">
<chat_history
font="SansSerifSmall"
follows="all"
visible="true"
- height="225"
name="chat_history"
parse_highlights="true"
parse_urls="true"
+ layout="topleft"
right="-5"
- left="5">
+ left="5"
+ top="0"
+ bottom="1">
</chat_history>
</layout_panel>
</layout_stack>
@@ -348,7 +350,6 @@
auto_resize="true"
name="input_editor_layout_panel">
<chat_editor
- top="6"
expand_lines_count="5"
follows="left|right|bottom"
font="SansSerifSmall"
@@ -363,6 +364,7 @@
spellcheck="true"
tab_group="3"
width="160"
+ top="6"
left="5"
right="-5"
wrap="true">