From ddbe9583ff0732ac6b8832a476fed4c6e0d54a49 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Sat, 14 Sep 2019 05:13:53 +0300 Subject: Backed out changeset: a6398f90389a --- indra/llplugin/llpluginclassmedia.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llplugin/llpluginclassmedia.h') diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 6f2b875116..9d11ee0421 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -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); -- cgit v1.2.3 From 2f7b6062026eb7b227e22580df6aa8dfb7234bf4 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Sat, 14 Sep 2019 05:14:24 +0300 Subject: Backed out changeset: 8e228364f324 --- indra/llplugin/llpluginclassmedia.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llplugin/llpluginclassmedia.h') diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 9d11ee0421..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 ); -- cgit v1.2.3