From 11c03f8fe3277313c27d5a35302c79d0d09bd670 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 19 Nov 2016 16:50:02 +0100
Subject: STORM-2140 LLLineEditor enabled-state cannot properly set via XUI

---
 indra/llui/lllineeditor.cpp | 7 +++++++
 indra/llui/lllineeditor.h   | 3 +++
 2 files changed, 10 insertions(+)

(limited to 'indra')

diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index fa99a19c9d..becb45fa79 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -221,6 +221,13 @@ LLLineEditor::~LLLineEditor()
 	gFocusMgr.releaseFocusIfNeeded( this );
 }
 
+void LLLineEditor::initFromParams(const LLLineEditor::Params& params)
+{
+	LLUICtrl::initFromParams(params);
+	LLUICtrl::setEnabled(TRUE);
+	setEnabled(params.enabled);
+}
+
 void LLLineEditor::onFocusReceived()
 {
 	gEditMenuHandler = this;
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h
index ccbd305a16..88468503df 100644
--- a/indra/llui/lllineeditor.h
+++ b/indra/llui/lllineeditor.h
@@ -108,6 +108,9 @@ public:
 		
 		Params();
 	};
+
+	void initFromParams(const LLLineEditor::Params& params);
+
 protected:
 	LLLineEditor(const Params&);
 	friend class LLUICtrlFactory;
-- 
cgit v1.2.3