diff options
author | Palmer Truelson <palmer@lindenlab.com> | 2009-12-22 14:06:48 -0600 |
---|---|---|
committer | Palmer Truelson <palmer@lindenlab.com> | 2009-12-22 14:06:48 -0600 |
commit | 616ca198143e7cc3f925add2c3b83aaf5d2fe244 (patch) | |
tree | a6f234275727009d196dbd6070753bcb02699bb0 /indra/llui/llmultisliderctrl.cpp | |
parent | 8f8e5c850a0574f30f9be1e3164531751139d2c5 (diff) | |
parent | e72a3c63ec44255172e253fe43e192918ec6117e (diff) |
Merge
Diffstat (limited to 'indra/llui/llmultisliderctrl.cpp')
-rw-r--r-- | indra/llui/llmultisliderctrl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llmultisliderctrl.cpp b/indra/llui/llmultisliderctrl.cpp index 7323323d8c..f4434a0f78 100644 --- a/indra/llui/llmultisliderctrl.cpp +++ b/indra/llui/llmultisliderctrl.cpp @@ -65,7 +65,8 @@ LLMultiSliderCtrl::Params::Params() text_color("text_color"), text_disabled_color("text_disabled_color"), mouse_down_callback("mouse_down_callback"), - mouse_up_callback("mouse_up_callback") + mouse_up_callback("mouse_up_callback"), + sliders("slider") { mouse_opaque = true; } @@ -161,6 +162,7 @@ LLMultiSliderCtrl::LLMultiSliderCtrl(const LLMultiSliderCtrl::Params& p) S32 slider_left = label_width ? label_width + multi_sliderctrl_spacing : 0; LLRect slider_rect( slider_left, top, slider_right, bottom ); LLMultiSlider::Params params; + params.sliders = p.sliders; params.rect(slider_rect); params.commit_callback.function( LLMultiSliderCtrl::onSliderCommit ); params.mouse_down_callback( p.mouse_down_callback ); |