diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-11-30 09:08:56 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-11-30 09:08:56 -0800 |
| commit | 79049c49bd34d58c3a3140d4fc50f586e45f3047 (patch) | |
| tree | bb1941153a12040abb44f66e25a4255e2f7bad54 /indra/llui | |
| parent | 65d56f53cd9a2028af177ec0315b721f59868d19 (diff) | |
| parent | d66012f85e885679738cf8c488fd8ff460319c85 (diff) | |
Merge
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llmultislider.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp index ece6edd285..9a7b6f9f6b 100644 --- a/indra/llui/llmultislider.cpp +++ b/indra/llui/llmultislider.cpp @@ -113,9 +113,9 @@ LLMultiSlider::LLMultiSlider(const LLMultiSlider::Params& p) setMouseUpCallback(initCommitCallback(p.mouse_up_callback)); } - if (p.overlap_threshold.isProvided()) + if (p.overlap_threshold.isProvided() && p.overlap_threshold > mIncrement) { - mOverlapThreshold = p.overlap_threshold; + mOverlapThreshold = p.overlap_threshold - mIncrement; } else { |