2 files changed, 11 insertions, 0 deletions

diff --git a/linden/indra/llplugin/llpluginclassmedia.cpp b/linden/indra/llplugin/llpluginclassmedia.cpp
index 8664524..9f14920 100755
--- a/linden/indra/llplugin/llpluginclassmedia.cpp
+++ b/linden/indra/llplugin/llpluginclassmedia.cpp
@@ -724,6 +724,9 @@ void LLPluginClassMedia::setJavascriptEnabled(const bool enabled)
 
 LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type)
 {
+  llassert(false);
+  return LLPluginClassMedia::TARGET_OTHER;
+#if 0
         // convert a LinkTargetType value from llqtwebkit to an ETargetType
         // so that we don't expose the llqtwebkit header in viewer code
         switch (target_type)
@@ -740,6 +743,7 @@ LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type)
         default:
                 return LLPluginClassMedia::TARGET_OTHER;
         }
+#endif
 }
 
 /* virtual */ 
diff --git a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
index ebf64f8..5058e0a 100755
--- a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -323,8 +323,13 @@ private:
                 // append details to agent string
                 LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent );
 
+#if 0   // FIXME (webkit_plugins): this doesn't compile with latest version of llqtwebkit
+                // error: ‘class LLQtWebKit’ has no member named ‘setWindowOpenBehavior’
+                // error: ‘WOB_SIMULATE_BLANK_HREF_CLICK’ is not a member of ‘LLQtWebKit’
+
                 // 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
@@ -518,7 +523,9 @@ private:
                 LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_href");
                 message.setValue("uri", event.getStringValue());
                 message.setValue("target", event.getStringValue2());
+#if 0 // FIXME (webkit_plugins): error: ‘const class LLEmbeddedBrowserWindowEvent’ has no member named ‘getLinkType’
                 message.setValueU32("target_type", event.getLinkType());
+#endif
                 sendMessage(message);
         }