diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-29 13:23:02 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-29 13:23:02 -0500 |
commit | 5f99331f4a9ed5ed78af7b47bdad152949e63ec4 (patch) | |
tree | 78aa91b7a1ac5f31a4e1de11f1a30d4b53561a05 /indra/llui/lllineeditor.cpp | |
parent | ed365b9c0eea12fa30629be7d26605b77eeedc05 (diff) | |
parent | 087c105317058dc3a011c937a5aceaf87fdecc26 (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
-rw-r--r-- | indra/llui/lllineeditor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 4064b7cc84..8c8c38415e 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -88,6 +88,7 @@ LLLineEditor::Params::Params() revert_on_esc("revert_on_esc", true), commit_on_focus_lost("commit_on_focus_lost", true), ignore_tab("ignore_tab", true), + is_password("is_password", false), cursor_color("cursor_color"), text_color("text_color"), text_readonly_color("text_readonly_color"), @@ -129,7 +130,7 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p) mBorderThickness( 0 ), mIgnoreArrowKeys( FALSE ), mIgnoreTab( p.ignore_tab ), - mDrawAsterixes( FALSE ), + mDrawAsterixes( p.is_password ), mSelectAllonFocusReceived( p.select_on_focus ), mPassDelete(FALSE), mReadOnly(FALSE), |