summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorPavelK ProductEngine <pkrivich@productengine.com>2013-05-24 18:19:10 +0300
committerPavelK ProductEngine <pkrivich@productengine.com>2013-05-24 18:19:10 +0300
commiteff548310117faaa9b8489891f60b4f2742da4cb (patch)
tree7cb3926b04af30c491111b2c6263cf2849413362 /indra
parentc272809aa6e52873c842b79ae47832ddf41dfcdb (diff)
CHUI-964 FIXED Oversized "To" input field hides actual IM text
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llui/llchatentry.cpp2
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_im_container.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp
index 416c3e65e4..c7e732e0c9 100755
--- a/indra/llui/llchatentry.cpp
+++ b/indra/llui/llchatentry.cpp
@@ -62,9 +62,9 @@ void LLChatEntry::draw()
{
if(mIsExpandable)
{
+ reflow();
expandText();
}
-
LLTextEditor::draw();
}
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 da016462db..1215efb7f9 100755
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -4,6 +4,7 @@
can_minimize="true"
can_resize="true"
height="210"
+ min_height="210"
layout="topleft"
name="floater_im_box"
help_topic="floater_im_box"