From a6f08b61c9303325687be756e1e980245f9d17cc Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 7 Nov 2010 11:32:57 -0700 Subject: Ported media_plugin_webkit changes from Snowglobe2, which are identical to SL2.3. This includes a more stable version of llqtwebkit for Windows --- linden/indra/media_plugins/webkit/media_plugin_webkit.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp index eed59a2..4a00557 100755 --- a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -37,7 +37,6 @@ #include "linden_common.h" #include "indra_constants.h" // for indra keyboard codes -#include #include "llgl.h" @@ -45,10 +44,10 @@ #include "llpluginmessage.h" #include "llpluginmessageclasses.h" #include "media_plugin_base.h" +#include // set to 1 if you're using the version of llqtwebkit that's QPixmap-ified #if LL_LINUX -# include # define LL_QTWEBKIT_USES_PIXMAPS 0 extern "C" { # include @@ -341,6 +340,12 @@ private: // append details to agent string LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent ); +// Viewer 2+ -- MC +#if LL_WINDOWS + // Set up window open behavior + LLQtWebKit::getInstance()->setWindowOpenBehavior(mBrowserWindowId, LLQtWebKit::WOB_SIMULATE_BLANK_HREF_CLICK); +#endif + #if !LL_QTWEBKIT_USES_PIXMAPS // don't flip bitmap LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true ); @@ -539,6 +544,7 @@ private: // This will work as long as we don't need "uuid", which will be needed for MoaP. message.setValue("uri", event.getStringValue()); message.setValue("target", event.getStringValue2()); + message.setValueU32("target_type", event.getLinkType()); #endif sendMessage(message); } -- cgit v1.1