diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2009-10-05 15:50:24 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2009-10-05 15:50:24 -0700 |
| commit | 39ee2367a7e771890017fc3d663780437ea69bb2 (patch) | |
| tree | b84c3ade59dba5ae032a3123afb9c3c5f78c9b68 /indra/llui/llscrollcontainer.h | |
| parent | 374deb8da13c63f80dc1b245488eb254eb86f5d2 (diff) | |
| parent | 6ef3f20933c5df684298bc1b8f338ce9dfd49070 (diff) | |
Merging due to changes since my last pull.
Diffstat (limited to 'indra/llui/llscrollcontainer.h')
| -rw-r--r-- | indra/llui/llscrollcontainer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h index 8385bca02f..ac8ffe5258 100644 --- a/indra/llui/llscrollcontainer.h +++ b/indra/llui/llscrollcontainer.h @@ -68,7 +68,8 @@ public: { Optional<bool> is_opaque, reserve_scroll_corner, - border_visible; + border_visible, + hide_scrollbar; Optional<F32> min_auto_scroll_rate, max_auto_scroll_rate; Optional<LLUIColor> bg_color; @@ -139,6 +140,7 @@ private: F32 mAutoScrollRate; F32 mMinAutoScrollRate; F32 mMaxAutoScrollRate; + bool mHideScrollbar; }; |