Merge v3.6.7 in

1 files changed, 6 insertions, 4 deletions

diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp
index 6a1b48a08a..c04b70eb64 100755
--- a/indra/llui/llchatentry.cpp
+++ b/indra/llui/llchatentry.cpp
@@ -62,9 +62,9 @@ void LLChatEntry::draw()
 {
 	if(mIsExpandable)
 	{
+		reflow();
 		expandText();
 	}
-
 	LLTextEditor::draw();
 }
 
@@ -158,19 +158,21 @@ void LLChatEntry::onValueChange(S32 start, S32 end)
     resetLabel();
 }
 
-bool LLChatEntry::useLabel()
+bool LLChatEntry::useLabel() const
 {
     return !getLength() && !mLabel.empty();
 }
 
 void LLChatEntry::onFocusReceived()
 {
-
+	LLUICtrl::onFocusReceived();
+	updateAllowingLanguageInput();
 }
 
 void LLChatEntry::onFocusLost()
 {
-
+	LLTextEditor::focusLostHelper();
+	LLUICtrl::onFocusLost();
 }
 
 BOOL LLChatEntry::handleSpecialKey(const KEY key, const MASK mask)