summaryrefslogtreecommitdiff
path: root/indra/llui/llmultislider.h
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-07-20 19:10:22 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-07-20 19:10:22 +0300
commitc822d8af16428cf245ae57305a4f39d3fccd672b (patch)
treeb0046845a6dc18ab1f93c8a5ee36ffe1793de628 /indra/llui/llmultislider.h
parentbb836fcdec22c4dbdc40f768be491e0d5d897089 (diff)
MAINT-8344 implement slider support for an overlap threshold and reenable shift-copy
Diffstat (limited to 'indra/llui/llmultislider.h')
-rw-r--r--indra/llui/llmultislider.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llmultislider.h b/indra/llui/llmultislider.h
index 0177597da2..9281b68406 100644
--- a/indra/llui/llmultislider.h
+++ b/indra/llui/llmultislider.h
@@ -50,6 +50,8 @@ public:
draw_track,
use_triangle;
+ Optional<F32> overlap_threshold;
+
Optional<LLUIColor> track_color,
thumb_disabled_color,
thumb_outline_color,
@@ -107,6 +109,7 @@ protected:
S32 mMaxNumSliders;
BOOL mAllowOverlap;
+ F32 mOverlapThreshold;
BOOL mDrawTrack;
BOOL mUseTriangle; /// hacked in toggle to use a triangle