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/llplugin/llpluginclassmedia.cpp | |
parent | d1411e43a9f138dd0682fd771c543815f13a9c00 (diff) | |
parent | 0ff935ca3cadb7bffd96f3cdca9b4f0f5eafc2d8 (diff) |
Downstream merge from lindenlab/viewer-serval
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.cpp')
-rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 78b1483810..85197d1272 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -664,12 +664,14 @@ bool LLPluginClassMedia::keyEvent(EKeyEventType type, int key_code, MASK modifie return result; } -void LLPluginClassMedia::scrollEvent(int x, int y, MASK modifiers) +void LLPluginClassMedia::scrollEvent(int x, int y, int clicks_x, int clicks_y, MASK modifiers) { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "scroll_event"); message.setValueS32("x", x); message.setValueS32("y", y); + message.setValueS32("clicks_x", clicks_x); + message.setValueS32("clicks_y", clicks_y); message.setValue("modifiers", translateModifiers(modifiers)); sendMessage(message); |