summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-06-26 17:15:48 -0700
committerMerov Linden <merov@lindenlab.com>2012-06-26 17:15:48 -0700
commite8ec428539d951bdd3a26623b1dc38c54a04753b (patch)
tree125b780a9c8c3847f7b53925a242ede581fee6f5 /indra/llui
parentc233f0c9494d7dddbd8baab0f87b0ad54f42b0f9 (diff)
parentabe106bd9c33fef12dcf4eacca228d5d669d9e34 (diff)
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llchatentry.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp
index a6ba125406..2a6ccc3dc9 100644
--- a/indra/llui/llchatentry.cpp
+++ b/indra/llui/llchatentry.cpp
@@ -57,12 +57,12 @@ LLChatEntry::~LLChatEntry()
void LLChatEntry::draw()
{
- LLTextEditor::draw();
-
if(mIsExpandable)
{
expandText();
}
+
+ LLTextEditor::draw();
}
void LLChatEntry::onCommit()