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/newview/llviewerwindow.h | |
| 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/newview/llviewerwindow.h')
| -rw-r--r-- | indra/newview/llviewerwindow.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index d084642fdc..385bbd57e5 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -208,6 +208,7 @@ public: /*virtual*/ void handleMenuSelect(LLWindow *window, S32 menu_item); /*virtual*/ BOOL handlePaint(LLWindow *window, S32 x, S32 y, S32 width, S32 height); /*virtual*/ void handleScrollWheel(LLWindow *window, S32 clicks); + /*virtual*/ void handleScrollHWheel(LLWindow *window, S32 clicks); /*virtual*/ BOOL handleDoubleClick(LLWindow *window, LLCoordGL pos, MASK mask); /*virtual*/ void handleWindowBlock(LLWindow *window); /*virtual*/ void handleWindowUnblock(LLWindow *window); @@ -326,6 +327,7 @@ public: BOOL handleKey(KEY key, MASK mask); BOOL handleKeyUp(KEY key, MASK mask); void handleScrollWheel (S32 clicks); + void handleScrollHWheel (S32 clicks); // add and remove views from "popup" layer void addPopup(LLView* popup); |