diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-16 18:22:59 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-16 18:22:59 +0300 |
| commit | e2eca8bd24ebc7f678b6a1051f899d564b0d8630 (patch) | |
| tree | 7daa422422d857a4cc941fccdce75648d3619aea /indra/llui/lltexteditor.cpp | |
| parent | c9430abf455c3282e60b96a6ca88d13d66a0cc82 (diff) | |
| parent | 7844914b03c062596812cdad1feffff700bcd45c (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 130cda3784..6781c23416 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -289,6 +289,9 @@ void LLTextEditor::initFromParams( const LLTextEditor::Params& p) { LLTextBase::initFromParams(p); + // HACK: text editors always need to be enabled so that we can scroll + LLView::setEnabled(true); + if (p.commit_on_focus_lost.isProvided()) { mCommitOnFocusLost = p.commit_on_focus_lost; |