summaryrefslogtreecommitdiff
path: root/indra/llui/llscrollcontainer.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-06-05 19:08:35 -0700
committerRichard Linden <none@none>2013-06-05 19:08:35 -0700
commit702bd5107a71aa3ac7c779a1e2ff0eaa53161e13 (patch)
treefeca9cc804b88e4f1b78a811ae7af359c67e5455 /indra/llui/llscrollcontainer.h
parent6cf85d1bf3eae2d2d798b756100c048ec2b1c411 (diff)
parente1d96d72692d70f7e16fb93d6ef1d42c89d26409 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/llui/llscrollcontainer.h')
-rwxr-xr-x[-rw-r--r--]indra/llui/llscrollcontainer.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
index f9ce4a74ef..b67236c939 100644..100755
--- a/indra/llui/llscrollcontainer.h
+++ b/indra/llui/llscrollcontainer.h
@@ -67,6 +67,7 @@ public:
max_auto_scroll_rate;
Optional<LLUIColor> bg_color;
Optional<LLScrollbar::callback_t> scroll_callback;
+ Optional<S32> size;
Params();
};
@@ -115,6 +116,9 @@ public:
bool autoScroll(S32 x, S32 y);
+ S32 getSize() const { return mSize; }
+ void setSize(S32 thickness);
+
protected:
LLView* mScrolledView;