diff options
author | Graham Linden <graham@lindenlab.com> | 2018-09-07 17:27:24 +0100 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2018-09-07 17:27:24 +0100 |
commit | 770baa28526cf4d860cdea6d97fa9f089a5941c7 (patch) | |
tree | f8c0b372fbee3957d8a6fbb760a923591e79e531 /indra/llui/llmultisliderctrl.cpp | |
parent | 4bd2b8b98ba1c562dfd65975a87ef5ee3db35633 (diff) | |
parent | df96fc652b452dbc9bd2daa7398ada1feb235fff (diff) |
Merge
Diffstat (limited to 'indra/llui/llmultisliderctrl.cpp')
-rw-r--r-- | indra/llui/llmultisliderctrl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llmultisliderctrl.cpp b/indra/llui/llmultisliderctrl.cpp index 4c2936eb69..73792206a6 100644 --- a/indra/llui/llmultisliderctrl.cpp +++ b/indra/llui/llmultisliderctrl.cpp @@ -54,6 +54,7 @@ LLMultiSliderCtrl::Params::Params() max_sliders("max_sliders", 1), allow_overlap("allow_overlap", false), loop_overlap("loop_overlap", false), + orientation("orientation"), overlap_threshold("overlap_threshold", 0), draw_track("draw_track", true), use_triangle("use_triangle", false), @@ -170,6 +171,7 @@ LLMultiSliderCtrl::LLMultiSliderCtrl(const LLMultiSliderCtrl::Params& p) params.max_sliders(p.max_sliders); params.allow_overlap(p.allow_overlap); params.loop_overlap(p.loop_overlap); + params.orientation(p.orientation()); if (p.overlap_threshold.isProvided()) { params.overlap_threshold = p.overlap_threshold; |