diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-24 00:10:37 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-24 00:10:37 +0300 |
| commit | a9471433eb7d0aa28c3a5b248ad34d3df4c096e7 (patch) | |
| tree | 9747c60524c240f22813584ec879f2e22b398021 /indra/newview/llviewermedia.h | |
| parent | e7883022b252bfffe8f7d133c6dc626bb95dc442 (diff) | |
| parent | c0087286e78098ee246ea821aefb5686ab8bda78 (diff) | |
Merge branch 'master' into DRTVWR-497
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(); |