From f42dbc3cae76e2b694c176c73e7d1dd47b5e3582 Mon Sep 17 00:00:00 2001 From: callum Date: Wed, 25 Nov 2009 14:53:46 -0800 Subject: Merge to Tip --- indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/media_plugins/quicktime/media_plugin_quicktime.cpp') 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") -- cgit v1.2.3 From a4f8fb48fc0a2b91abfb5f732669f0ece2dfb1b7 Mon Sep 17 00:00:00 2001 From: callum Date: Wed, 25 Nov 2009 14:57:28 -0800 Subject: Revert debugging code introduced in last check-in --- indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/media_plugins/quicktime/media_plugin_quicktime.cpp') diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index ff01ac0d61..236f79978d 100644 --- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp @@ -1008,8 +1008,6 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string) if(event == "down") { -memset( (void*)this, 0, 30000 ); - mouseDown(x, y); } else if(event == "up") -- cgit v1.2.3 From 8e3276ebf9fc87b3d622dd23dbf22b10ffb494f2 Mon Sep 17 00:00:00 2001 From: "bea@american.lindenlab.com" Date: Mon, 30 Nov 2009 14:53:31 -0800 Subject: doxygen: exclude licensing comments --- indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/media_plugins/quicktime/media_plugin_quicktime.cpp') diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index 236f79978d..dbc44c8334 100644 --- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp @@ -2,6 +2,7 @@ * @file media_plugin_quicktime.cpp * @brief QuickTime plugin for LLMedia API plugin system * + * @cond * $LicenseInfo:firstyear=2008&license=viewergpl$ * * Copyright (c) 2008, Linden Research, Inc. @@ -27,6 +28,7 @@ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, * COMPLETENESS OR PERFORMANCE. * $/LicenseInfo$ + * @endcond */ #include "linden_common.h" -- cgit v1.2.3