diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-01-29 17:09:17 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-01-29 17:09:17 +0000 |
| commit | eaf83ea9c7eef663456507c32b0c1511ab69d157 (patch) | |
| tree | 7f608467b3608127049ddc78d5045da032777cb4 /indra/llui/llscrolllistctrl.cpp | |
| parent | 3e44cb06df22dd1b684dc8574c3b44d0851527bc (diff) | |
| parent | 2a6b48c9b0c813c5e4ff8ac176fdf4e6c9466c22 (diff) | |
Merged in D440-merge-master (pull request #1)
Merge master (release 6.3.7) into DRTVWR-440
Approved-by: Dave Houlton <euclid@lindenlab.com>
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index f4028057e8..6c8fde580f 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -1601,6 +1601,20 @@ BOOL LLScrollListCtrl::handleScrollWheel(S32 x, S32 y, S32 clicks) return handled; } +BOOL LLScrollListCtrl::handleScrollHWheel(S32 x, S32 y, S32 clicks) +{ + BOOL handled = FALSE; + // Pretend the mouse is over the scrollbar + handled = mScrollbar->handleScrollHWheel( 0, 0, clicks ); + + if (mMouseWheelOpaque) + { + return TRUE; + } + + return handled; +} + // *NOTE: Requires a valid row_index and column_index LLRect LLScrollListCtrl::getCellRect(S32 row_index, S32 column_index) { |