diff options
author | Oz Linden <oz@lindenlab.com> | 2013-04-01 09:34:41 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-04-01 09:34:41 -0400 |
commit | 90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (patch) | |
tree | 581e4ba644ebf770dbdab292ea9f10d4b9404cb6 /indra/llui/llscrollbar.cpp | |
parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) | |
parent | 49bef4e122e3ab4c82962e25f4ec1803c4e0c600 (diff) |
merge changes for 3.5.0-beta7
Diffstat (limited to 'indra/llui/llscrollbar.cpp')
-rw-r--r-- | indra/llui/llscrollbar.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp index 5d3bf7a670..13887cbe73 100644 --- a/indra/llui/llscrollbar.cpp +++ b/indra/llui/llscrollbar.cpp @@ -642,3 +642,8 @@ void LLScrollbar::onLineDownBtnPressed( const LLSD& data ) { changeLine( mStepSize, TRUE ); } + +void LLScrollbar::setThickness(S32 thickness) +{ + mThickness = thickness < 0 ? LLUI::sSettingGroups["config"]->getS32("UIScrollbarSize") : thickness; +} |