diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-01-28 17:26:45 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-01-28 17:26:45 -0700 |
| commit | 2a6b48c9b0c813c5e4ff8ac176fdf4e6c9466c22 (patch) | |
| tree | 7f608467b3608127049ddc78d5045da032777cb4 /indra/llui/llscrollcontainer.cpp | |
| parent | 3e44cb06df22dd1b684dc8574c3b44d0851527bc (diff) | |
| parent | 2998552f3d7447da316afdd1713595528596a0c5 (diff) | |
DRTVWR-440, merge in latest from 6.3.7 release
Diffstat (limited to 'indra/llui/llscrollcontainer.cpp')
| -rw-r--r-- | indra/llui/llscrollcontainer.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index 6135cc56ad..3db38bbfac 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -272,6 +272,25 @@ BOOL LLScrollContainer::handleScrollWheel( S32 x, S32 y, S32 clicks ) return FALSE; } +BOOL LLScrollContainer::handleScrollHWheel(S32 x, S32 y, S32 clicks) +{ + if (LLUICtrl::handleScrollHWheel(x,y,clicks)) + { + return TRUE; + } + + LLScrollbar* horizontal = mScrollbar[HORIZONTAL]; + if (horizontal->getVisible() + && horizontal->getEnabled() + && horizontal->handleScrollHWheel( 0, 0, clicks ) ) + { + updateScroll(); + return TRUE; + } + + return FALSE; +} + BOOL LLScrollContainer::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, |