diff options
| author | Richard Nelson <none@none> | 2010-08-24 10:50:50 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-08-24 10:50:50 -0700 |
| commit | 77c42fc77ead297be3ea673309699edd15f70441 (patch) | |
| tree | 58082e287471c84b76934dfc37503ab5ab95aee9 /indra/llui/llview.cpp | |
| parent | 4115decfa14bb3d20f464ed0e0e3b3ec6c7b6e02 (diff) | |
| parent | 65c9914d23022df6a39db50ce295750f08695893 (diff) | |
merge
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 3ee4a85de0..48db873b6f 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -111,8 +111,8 @@ LLView::Params::Params() user_resize("user_resize"), auto_resize("auto_resize"), needs_translate("translate"), - min_width("min_width"), - max_width("max_width"), + min_dim("min_width"), + max_dim("max_width"), xmlns("xmlns"), xmlns_xsi("xmlns:xsi"), xsi_schemaLocation("xsi:schemaLocation"), @@ -120,6 +120,8 @@ LLView::Params::Params() { addSynonym(rect, ""); + addSynonym(min_dim, "min_height"); + addSynonym(max_dim, "max_height"); } LLView::LLView(const LLView::Params& p) |