Ported media_plugin_webkit changes from Snowglobe2, which are identical to SL2.3. This includes a more stable version of llqtwebkit for Windows

2 files changed, 10 insertions, 4 deletions

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 <iomanip>
 
 #include "llgl.h"
 
@@ -45,10 +44,10 @@
 #include "llpluginmessage.h"
 #include "llpluginmessageclasses.h"
 #include "media_plugin_base.h"
+#include <iomanip> 
 
 // set to 1 if you're using the version of llqtwebkit that's QPixmap-ified
 #if LL_LINUX
-# include <iomanip> 
 # define LL_QTWEBKIT_USES_PIXMAPS 0
 extern "C" {
 # include <glib.h>
@@ -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);
         }
diff --git a/linden/install.xml b/linden/install.xml
index fbb269a..ec57a7b 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -1057,9 +1057,9 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>4b8412833c00f8cdaba26808f0ddb404</string>
+            <string>df1bdd683128e060d60e435f65d8f7e8</string>
             <key>url</key>
-            <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100916.tar.bz2</uri>
+            <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100617.tar.bz2</uri>
           </map>
         </map>
       </map>