diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-06-21 18:29:50 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-06-21 18:29:50 -0400 |
commit | d5ea63119d1cc848318dbeeaa42e9ce3b777ee51 (patch) | |
tree | 4b5403406184c8e7635ccb989a2dfceb46f95693 /indra/llui/llspinctrl.cpp | |
parent | 20100ba38c6d3fa16ab11be2ed326ab0964c4c21 (diff) | |
parent | ede3b577d8cebd5065514bb485e2cbd93dd5b05a (diff) |
Merge
Diffstat (limited to 'indra/llui/llspinctrl.cpp')
-rw-r--r-- | indra/llui/llspinctrl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp index 6b4e9cf923..15a7438ec9 100644 --- a/indra/llui/llspinctrl.cpp +++ b/indra/llui/llspinctrl.cpp @@ -52,6 +52,7 @@ LLSpinCtrl::Params::Params() : label_width("label_width"), decimal_digits("decimal_digits"), allow_text_entry("allow_text_entry", true), + label_wrap("label_wrap", false), text_enabled_color("text_enabled_color"), text_disabled_color("text_disabled_color"), up_button("up_button"), @@ -80,6 +81,7 @@ LLSpinCtrl::LLSpinCtrl(const LLSpinCtrl::Params& p) { LLRect label_rect( 0, centered_top, label_width, centered_bottom ); LLTextBox::Params params; + params.wrap(p.label_wrap); params.name("SpinCtrl Label"); params.rect(label_rect); params.initial_value(p.label()); |