diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-09 22:51:21 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-09 22:51:21 +0100 |
| commit | 090ee2682b06dd083e7bd5fb1ba6fa574fefadaa (patch) | |
| tree | 642bf3d7477b59025d2f1fdd33240da87c961000 /indra/llui/llmultislider.h | |
| parent | d2d1db99d3ad17d63dd13758001d83a254569942 (diff) | |
| parent | 3a3d0cbc79cd7371446af38e6d1c6b9cff1da0c3 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llmultislider.h')
| -rw-r--r-- | indra/llui/llmultislider.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llmultislider.h b/indra/llui/llmultislider.h index 9281b68406..eff0c7d2d7 100644 --- a/indra/llui/llmultislider.h +++ b/indra/llui/llmultislider.h @@ -47,6 +47,7 @@ public: Optional<S32> max_sliders; Optional<bool> allow_overlap, + loop_overlap, draw_track, use_triangle; @@ -109,6 +110,7 @@ protected: S32 mMaxNumSliders; BOOL mAllowOverlap; + BOOL mLoopOverlap; F32 mOverlapThreshold; BOOL mDrawTrack; BOOL mUseTriangle; /// hacked in toggle to use a triangle |