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.h | |
parent | d1411e43a9f138dd0682fd771c543815f13a9c00 (diff) | |
parent | 0ff935ca3cadb7bffd96f3cdca9b4f0f5eafc2d8 (diff) |
Downstream merge from lindenlab/viewer-serval
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
-rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 4f52afb317..9d11ee0421 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -118,7 +118,7 @@ public: bool keyEvent(EKeyEventType type, int key_code, MASK modifiers, LLSD native_key_data); - void scrollEvent(int x, int y, MASK modifiers); + void scrollEvent(int x, int y, int clicks_x, int clicks_y, MASK modifiers); // enable/disable media plugin debugging messages and info spam void enableMediaPluginDebugging( bool enable ); |