diff options
| author | Ansariel <none@none> | 2016-11-19 16:50:02 +0100 | 
|---|---|---|
| committer | Ansariel <none@none> | 2016-11-19 16:50:02 +0100 | 
| commit | 11c03f8fe3277313c27d5a35302c79d0d09bd670 (patch) | |
| tree | 4e51061c7f04de3c9be050f9f1ac5cd605d4a631 /indra | |
| parent | 75eb1e6ca6ccb501dba43ccdcaff5c500ca62170 (diff) | |
STORM-2140 LLLineEditor enabled-state cannot properly set via XUI
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 7 | ||||
| -rw-r--r-- | indra/llui/lllineeditor.h | 3 | 
2 files changed, 10 insertions, 0 deletions
| 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; | 
