diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-07-30 15:55:33 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-07-30 15:55:33 -0700 |
| commit | dbbb89a13c99dce50b5c2a124bd3a5ccc23ef7f6 (patch) | |
| tree | 51217fdcd57e3adcbe7ba6e428c4e0f0a68012a3 /indra/llui/llmultisliderctrl.h | |
| parent | d6ede8e81cad497a6cd8482dfb48c99bdf5c258a (diff) | |
| parent | d7ae8a0d28483a8ed5d93152177aa655266f7004 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llmultisliderctrl.h')
| -rw-r--r-- | indra/llui/llmultisliderctrl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llmultisliderctrl.h b/indra/llui/llmultisliderctrl.h index 5c4777ebd0..507115f5e1 100644 --- a/indra/llui/llmultisliderctrl.h +++ b/indra/llui/llmultisliderctrl.h @@ -57,6 +57,8 @@ public: draw_track, use_triangle; + Optional<F32> overlap_threshold; + Optional<LLUIColor> text_color, text_disabled_color; |