diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-08 16:34:54 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-08 16:34:54 -0700 |
| commit | f2acd554bcf8326824acc23457a38a70021b0026 (patch) | |
| tree | 15500c4e151762303dda8899befc339c3a9838b2 /indra/llui | |
| parent | 0a4bce2b79091ee5b8f4c309a62a86538a2bce72 (diff) | |
Clean up erroneous XUI parsing errors.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/llmenugl.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index c2173fb89c..ebdd47ae80 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -107,6 +107,7 @@ LLLineEditor::Params::Params() 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) diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index b5579a831a..77db588390 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -372,15 +372,16 @@ public: drop_shadow("drop_shadow", true), bg_visible("bg_visible", true), create_jump_keys("create_jump_keys", false), + keep_fixed_size("keep_fixed_size", false), bg_color("bg_color", LLUIColorTable::instance().getColor( "MenuDefaultBgColor" )), scrollable("scrollable", false), max_scrollable_items("max_scrollable_items", U32_MAX), preferred_width("preferred_width", U32_MAX), shortcut_pad("shortcut_pad") - { addSynonym(bg_visible, "opaque"); addSynonym(bg_color, "color"); + addSynonym(can_tear_off, "can_tear_off"); } }; |