From 8a62086cb0a9a8ae746bffa57e785cc4ca5be3a5 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Fri, 15 Oct 2010 18:01:07 +0200 Subject: Comment out code to make it compile at all (with the latest llqtwebkit). --- linden/indra/llplugin/llpluginclassmedia.cpp | 4 ++++ linden/indra/media_plugins/webkit/media_plugin_webkit.cpp | 7 +++++++ 2 files changed, 11 insertions(+) (limited to 'linden') 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); } -- cgit v1.1