diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-02 10:35:42 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-02 10:35:42 -0700 |
| commit | 4d53e235c2445b820bb0ae7303b269648dd86037 (patch) | |
| tree | c1ab3643cf257099822e7a0e1e832d76813555f6 /indra/llui/llscrollbar.h | |
| parent | 80f27013b2d2a7ca6509db033c8f0c31562e04c7 (diff) | |
| parent | dde2153014cd7d7b8fa704f7067a41344bfbb1c2 (diff) | |
merge of latest viewer/viewer-20
Diffstat (limited to 'indra/llui/llscrollbar.h')
| -rw-r--r-- | indra/llui/llscrollbar.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/llscrollbar.h b/indra/llui/llscrollbar.h index 30d906e04c..7e88b16561 100644 --- a/indra/llui/llscrollbar.h +++ b/indra/llui/llscrollbar.h @@ -66,8 +66,11 @@ public: track_image_horizontal, track_image_vertical; + Optional<bool> bg_visible; + Optional<LLUIColor> track_color, - thumb_color; + thumb_color, + bg_color; Optional<LLButton::Params> up_button; Optional<LLButton::Params> down_button; @@ -151,6 +154,9 @@ private: LLUIColor mTrackColor; LLUIColor mThumbColor; + LLUIColor mBGColor; + + bool mBGVisible; LLUIImagePtr mThumbImageV; LLUIImagePtr mThumbImageH; |