diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
| commit | a41ca2c34d291b4eebdeeb4475b512f2a8af5cb1 (patch) | |
| tree | e305b00950eb562abec94ce33307b6694ca6ec98 /indra/llui/lllineeditor.cpp | |
| parent | fd91f09e19f937cb7e2f779c4e146064415ad427 (diff) | |
| parent | 5f38ec7f92fcea833352cd30797a9d73ef5a041f (diff) | |
merge fixes for storm-1602 up to latest viewer-development
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(); } |