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/llviewermedia.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/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 9467a138f0..512c5a8279 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -235,6 +235,7 @@ public: void mouseMove(const LLVector2& texture_coords, MASK mask); void mouseDoubleClick(const LLVector2& texture_coords, MASK mask); void mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button = 0); + void scrollWheel(const LLVector2& texture_coords, S32 scroll_x, S32 scroll_y, MASK mask); void scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask); void mouseCapture(); |