diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2018-01-12 09:08:49 -0500 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2018-01-12 09:08:49 -0500 |
| commit | 1e586749efeeb8c40503330572680a8709ae5487 (patch) | |
| tree | 5c1ebee5dbdb5004f354b9fb0837d60f6dd3cfcc /indra/llui/lllineeditor.cpp | |
| parent | 32f16633c77564d567ed0752e56eb38abb916ccd (diff) | |
| parent | 1693ccba58eef676df1f91e50627545ac35bb819 (diff) | |
STORM-2145 Merge up to viewer-release
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index c89e1dac1d..becb45fa79 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()); @@ -218,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; |