diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-06-23 23:58:53 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-06-23 23:58:53 +0300 |
| commit | 9c04b0519eb57f5be5cb7f9a93458db14c0c6a69 (patch) | |
| tree | d027e64f2ccfb0a68f9817edd7e063af8310c37e /indra/newview/llviewermedia.h | |
| parent | 7717097f7cfa1deaa934b9846c22523f53c600d3 (diff) | |
| parent | c0087286e78098ee246ea821aefb5686ab8bda78 (diff) | |
Merged master into DRTVWR-514
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 a5cde35c88..8bf1ad2441 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(); |