summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2016-11-16 16:48:56 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2016-11-16 16:48:56 +0200
commitdeb8f582c56bd6035f9f2c3d57b8865a1c928936 (patch)
tree452416d9a23d6288141b167c2a4902be190df9b3 /indra/llui
parent93eef6ab195c3b49c7fc424eb07eca27c710caad (diff)
STORM-2140 LLLineEditor enabled-state cannot properly set via XUI
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lllineeditor.cpp4
1 files changed, 3 insertions, 1 deletions
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();