diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-16 04:20:44 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-16 04:20:44 +0300 |
| commit | 718bd55f686945c61cd903938a2ed508d653a6e3 (patch) | |
| tree | 3d7e1174dd225ec2be452b6ad5f2e4f8fce19d5b /indra/newview/llviewermedia.h | |
| parent | d1411e43a9f138dd0682fd771c543815f13a9c00 (diff) | |
| parent | 0ff935ca3cadb7bffd96f3cdca9b4f0f5eafc2d8 (diff) | |
Downstream merge from lindenlab/viewer-serval
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index b25358ae6c..9896399774 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -229,7 +229,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(S32 x, S32 y, MASK mask); + void scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask); void mouseCapture(); void navigateBack(); |