diff options
author | Dave Parks <davep@lindenlab.com> | 2012-03-09 15:50:51 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-03-09 15:50:51 -0600 |
commit | 8e60cdb3335ec198c71b29d37ab08c4aff9f8223 (patch) | |
tree | 2e043ee721d725dcc8d654a8f51eaafaaeb423de /indra/llui/lllineeditor.cpp | |
parent | 1d200c56e151eb8fc384693175d1b9318ff0f919 (diff) | |
parent | 4b20d72a991cfebaf5765fe7756190f4a9645a3b (diff) |
merge
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
-rw-r--r-- | indra/llui/lllineeditor.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 06fbc0f234..06dfc90d83 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -103,10 +103,11 @@ LLLineEditor::Params::Params() text_pad_right("text_pad_right"), default_text("default_text") { - mouse_opaque = true; + changeDefault(mouse_opaque, true); addSynonym(select_on_focus, "select_all_on_focus_received"); addSynonym(border, "border"); addSynonym(label, "watermark_text"); + addSynonym(max_length.chars, "max_length"); } LLLineEditor::LLLineEditor(const LLLineEditor::Params& p) @@ -197,6 +198,7 @@ LLLineEditor::~LLLineEditor() void LLLineEditor::onFocusReceived() { + gEditMenuHandler = this; LLUICtrl::onFocusReceived(); updateAllowingLanguageInput(); } |