IMP-692: SNOW-713: Merge branch 'weekly' into SNOW-713

Conflicts:
	linden/indra/newview/viewer_manifest.py

Trivial proximity collision. Resolved.

2 files changed, 23 insertions, 24 deletions

diff --git a/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
index 68b9679..999f754 100755
--- a/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
+++ b/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
@@ -3,33 +3,26 @@
  * @brief QuickTime plugin for LLMedia API plugin system
  *
  * @cond
- * $LicenseInfo:firstyear=2008&license=viewergpl$
- * 
- * Copyright (c) 2008-2010, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2008&license=viewerlgpl$
  * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * Copyright (C) 2010, Linden Research, Inc.
  * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlife.com/developers/opensource/flossexception
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
  * @endcond
  */
 
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);
         }