summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2016-11-07 12:33:14 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2016-11-07 12:33:14 +0200
commit6083fd1cbef478c15c49055d27270d0a6f2ddfa2 (patch)
tree6c3b4fc11fbdf265477f123191e0789cb4138bab
parent28c9002e980cf2ac6a7b7c79f8e16a64994c21c4 (diff)
STORM-2140 LLLineEditor enabled-state cannot properly set via XUI
-rwxr-xr-xdoc/contributions.txt1
-rw-r--r--indra/llui/lllineeditor.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index c0c4f7837e..00e09e452f 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -205,6 +205,7 @@ Ansariel Hiller
MAINT-6752
MAINT-6773
MAINT-6906
+ STORM-2140
Aralara Rajal
Arare Chantilly
CHUIBUG-191
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index c89e1dac1d..118339577a 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -335,6 +335,7 @@ void LLLineEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
void LLLineEditor::setEnabled(BOOL enabled)
{
+ LLUICtrl::setEnabled(enabled);
mReadOnly = !enabled;
setTabStop(!mReadOnly);
updateAllowingLanguageInput();