From 66848f7a94438f2fe9edd4fad9c12ea44ad285b2 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Mon, 9 Nov 2015 11:53:09 -0800
Subject: [PATCH] Undo the clobbering that the PR did :)
---
indra/media_plugins/cef/media_plugin_cef.cpp | 5 +++--
1 file 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 7d60c1a5edd..ea451ed5b6b 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")
{
--
GitLab