diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-15 20:36:12 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-15 20:36:12 +0300 |
| commit | 885c56a660343beb796a74fb21cc624d0e57d2ef (patch) | |
| tree | 898667e50fb2a13d3b22f8484367ccbc7929d748 /indra/llplugin/llpluginclassmedia.h | |
| parent | 9666a96e68cb6b75031051fc43f44b2c566b135c (diff) | |
| parent | 35d3901b99111f52f8ed236f4790a809f500bd44 (diff) | |
Downstream merge from lindenlab/viewer-bear
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 6f2b875116..4f52afb317 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, int clicks_x, int clicks_y, MASK modifiers); + void scrollEvent(int x, int y, MASK modifiers); // enable/disable media plugin debugging messages and info spam void enableMediaPluginDebugging( bool enable ); @@ -195,7 +195,7 @@ public: bool canPaste() const { return mCanPaste; }; // These can be called before init(), and they will be queued and sent before the media init message. - void setUserDataPath(const std::string &user_data_path_cache, const std::string &user_data_path_cef_log); + void setUserDataPath(const std::string &user_data_path_cache, const std::string &user_data_path_cookies, const std::string &user_data_path_cef_log); void setLanguageCode(const std::string &language_code); void setPluginsEnabled(const bool enabled); void setJavascriptEnabled(const bool enabled); |