diff options
author | simon <none@none> | 2013-04-11 16:04:21 -0700 |
---|---|---|
committer | simon <none@none> | 2013-04-11 16:04:21 -0700 |
commit | c7bab8ab8b25249d1f8f87746b50fce4820f542a (patch) | |
tree | f10f811e0a03002b4c545eb5c51f99d7c5b83a5b /indra/llui/llscrollcontainer.h | |
parent | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (diff) | |
parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) |
Merge
Diffstat (limited to 'indra/llui/llscrollcontainer.h')
-rw-r--r-- | indra/llui/llscrollcontainer.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h index d87c95b3d7..4eb43539b8 100644 --- a/indra/llui/llscrollcontainer.h +++ b/indra/llui/llscrollcontainer.h @@ -68,6 +68,7 @@ public: max_auto_scroll_rate; Optional<LLUIColor> bg_color; Optional<LLScrollbar::callback_t> scroll_callback; + Optional<S32> size; Params(); }; @@ -116,6 +117,9 @@ public: bool autoScroll(S32 x, S32 y); + S32 getSize() const { return mSize; } + void setSize(S32 thickness); + protected: LLView* mScrolledView; |