summaryrefslogtreecommitdiff
path: root/indra/llui/lllineeditor.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-23 19:41:44 -0500
committerOz Linden <oz@lindenlab.com>2010-12-23 19:41:44 -0500
commit5a4bb72b8d37ca51deb84e1490fdefe2908d2d59 (patch)
tree9a22b0583bb290a242df3c619665fdb692e1ecef /indra/llui/lllineeditor.cpp
parent86380bb177b9e18e345bc302efb3a84b2c5758a9 (diff)
parent49de8add8355455da4b6ec5aaa55427fafa94322 (diff)
Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-export
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
-rw-r--r--indra/llui/lllineeditor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index aed391c780..7e348656a9 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),