diff options
author | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 21:52:37 +0000 |
---|---|---|
committer | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 21:52:37 +0000 |
commit | 08f04113c9252258c9cb6132efa327432c3c27e0 (patch) | |
tree | 5ec6c6d42eaca354f58e21b926d9108e43367484 /indra/llui/llmultislider.h | |
parent | 10f84d8244d01728338f1eb20b0b25271fc7db63 (diff) | |
parent | aa322d8eb4341c213a19cef87a887114c1ca278b (diff) |
Merged in DV541-merge-6.4.22 (pull request #629)
DRTVWR-541 merge up to v 6.4.22
Diffstat (limited to 'indra/llui/llmultislider.h')
-rw-r--r-- | indra/llui/llmultislider.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llmultislider.h b/indra/llui/llmultislider.h index 99a78d6e09..3cb4b760b0 100644 --- a/indra/llui/llmultislider.h +++ b/indra/llui/llmultislider.h @@ -150,6 +150,7 @@ protected: LLUIColor mDisabledThumbColor; LLUIColor mTriangleColor; LLUIImagePtr mThumbImagep; //blimps on the slider, for now no 'disabled' support + LLUIImagePtr mRoundedSquareImgp; //blimps on the slider, for now no 'disabled' support const EOrientation mOrientation; |