diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-11-10 13:46:48 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-11-10 13:46:48 -0800 |
| commit | 310c9fee076798f206f074ae28db3b9571884987 (patch) | |
| tree | e737c522948d882691807556ad4ead35d5043dee | |
| parent | 059925eafb66dc0e2d8ef9c113ca8980a34c655d (diff) | |
| parent | 66848f7a94438f2fe9edd4fad9c12ea44ad285b2 (diff) | |
Merge
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 7d60c1a5ed..ea451ed5b6 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -128,7 +128,7 @@ MediaPluginBase(host_send_func, host_user_data) // MediaPluginCEF::~MediaPluginCEF() { - mLLCEFLib->reset(); + mLLCEFLib->requestExit(); } //////////////////////////////////////////////////////////////////////////////// @@ -532,11 +532,12 @@ void MediaPluginCEF::receiveMessage(const char* message_string) } else if (message_name == "scroll_event") { + S32 x = message_in.getValueS32("x"); S32 y = message_in.getValueS32("y"); const int scaling_factor = 40; y *= -scaling_factor; - mLLCEFLib->mouseWheel(y); + mLLCEFLib->mouseWheel(x, y); } else if (message_name == "text_event") { |