From deb8f582c56bd6035f9f2c3d57b8865a1c928936 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 16 Nov 2016 16:48:56 +0200
Subject: STORM-2140 LLLineEditor enabled-state cannot properly set via XUI

---
 indra/llui/lllineeditor.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/llui')

diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 118339577a..fa99a19c9d 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -163,6 +163,9 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
 {
 	llassert( mMaxLengthBytes > 0 );
 
+	LLUICtrl::setEnabled(TRUE);
+	setEnabled(p.enabled);
+
 	mScrollTimer.reset();
 	mTripleClickTimer.reset();
 	setText(p.default_text());
@@ -335,7 +338,6 @@ void LLLineEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
 
 void LLLineEditor::setEnabled(BOOL enabled)
 {
-	LLUICtrl::setEnabled(enabled);
 	mReadOnly = !enabled;
 	setTabStop(!mReadOnly);
 	updateAllowingLanguageInput();
-- 
cgit v1.2.3