diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2020-06-23 22:03:43 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-06-23 22:03:43 -0400 |
| commit | 77cf4588dfa0213b8166b5575868df75b411a824 (patch) | |
| tree | 101bf94283b5e1967b0458e16ca21e62e80c1361 /indra/newview/lltoolpie.h | |
| parent | f627140cf11232bab11fdfaf66c78544cf44f3e8 (diff) | |
| parent | c0087286e78098ee246ea821aefb5686ab8bda78 (diff) | |
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476
following release of D512.
Diffstat (limited to 'indra/newview/lltoolpie.h')
| -rw-r--r-- | indra/newview/lltoolpie.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index fe0acfe473..2d6c22f425 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -49,6 +49,7 @@ public: virtual BOOL handleRightMouseUp(S32 x, S32 y, MASK mask); virtual BOOL handleHover(S32 x, S32 y, MASK mask); virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); + BOOL handleScrollWheelAny(S32 x, S32 y, S32 clicks_x, S32 clicks_y); virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); virtual BOOL handleScrollHWheel(S32 x, S32 y, S32 clicks); virtual BOOL handleToolTip(S32 x, S32 y, MASK mask); |