diff options
| author | callum <none@none> | 2009-11-25 14:53:46 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-11-25 14:53:46 -0800 |
| commit | f42dbc3cae76e2b694c176c73e7d1dd47b5e3582 (patch) | |
| tree | 4614ebe8b4b6ec2bb35457369123d641d53e696f | |
| parent | cf8b85106146af46aa81cb4efcdca8a597b5d84c (diff) | |
Merge to Tip
| -rw-r--r-- | indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 2 | ||||
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index 236f79978d..ff01ac0d61 100644 --- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp @@ -1008,6 +1008,8 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string) if(event == "down") { +memset( (void*)this, 0, 30000 ); + mouseDown(x, y); } else if(event == "up") diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 09348782a4..b7ac8ef1b4 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -750,6 +750,7 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) LLQtWebKit::EMouseEvent mouse_event = LLQtWebKit::ME_MOUSE_MOVE; if(event == "down") { +memset( (void*)this, 0, 30000 ); mouse_event = LLQtWebKit::ME_MOUSE_DOWN; } else if(event == "up") |