diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
| commit | 9f393c1d99232e622317f7f0dd28519c2af63d0d (patch) | |
| tree | 842f1ab4c5d13bc1cd772ebf1356c8f7424596d9 /indra/llui/llscrollcontainer.h | |
| parent | 2b2719d8cae1e35fa9e4cfcb87519bae9a64b2bf (diff) | |
| parent | a4966a661213a25b780604084fe169565f62f548 (diff) | |
merge up to latest snowstorm integration branch
Diffstat (limited to 'indra/llui/llscrollcontainer.h')
| -rwxr-xr-x[-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..100755 --- 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; |