summaryrefslogtreecommitdiff
path: root/indra/media_plugins/cef/media_plugin_cef.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-11-09 11:53:09 -0800
committercallum_linden <none@none>2015-11-09 11:53:09 -0800
commit66848f7a94438f2fe9edd4fad9c12ea44ad285b2 (patch)
tree4de7011386172b1fb462d8744077fc1a11206660 /indra/media_plugins/cef/media_plugin_cef.cpp
parenta743d939071fbdbbf619f2e282419623da932322 (diff)
Undo the clobbering that the PR did :)
Diffstat (limited to 'indra/media_plugins/cef/media_plugin_cef.cpp')
-rw-r--r--indra/media_plugins/cef/media_plugin_cef.cpp5
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")
{