aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xlinden/indra/llplugin/llpluginclassmedia.cpp4
-rwxr-xr-xlinden/indra/media_plugins/webkit/media_plugin_webkit.cpp7
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)
724 724
725LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type) 725LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type)
726{ 726{
727 llassert(false);
728 return LLPluginClassMedia::TARGET_OTHER;
729#if 0
727 // convert a LinkTargetType value from llqtwebkit to an ETargetType 730 // convert a LinkTargetType value from llqtwebkit to an ETargetType
728 // so that we don't expose the llqtwebkit header in viewer code 731 // so that we don't expose the llqtwebkit header in viewer code
729 switch (target_type) 732 switch (target_type)
@@ -740,6 +743,7 @@ LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type)
740 default: 743 default:
741 return LLPluginClassMedia::TARGET_OTHER; 744 return LLPluginClassMedia::TARGET_OTHER;
742 } 745 }
746#endif
743} 747}
744 748
745/* virtual */ 749/* 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:
323 // append details to agent string 323 // append details to agent string
324 LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent ); 324 LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent );
325 325
326#if 0 // FIXME (webkit_plugins): this doesn't compile with latest version of llqtwebkit
327 // error: ‘class LLQtWebKit’ has no member named ‘setWindowOpenBehavior’
328 // error: ‘WOB_SIMULATE_BLANK_HREF_CLICK’ is not a member of ‘LLQtWebKit’
329
326 // Set up window open behavior 330 // Set up window open behavior
327 LLQtWebKit::getInstance()->setWindowOpenBehavior(mBrowserWindowId, LLQtWebKit::WOB_SIMULATE_BLANK_HREF_CLICK); 331 LLQtWebKit::getInstance()->setWindowOpenBehavior(mBrowserWindowId, LLQtWebKit::WOB_SIMULATE_BLANK_HREF_CLICK);
332#endif
328 333
329#if !LL_QTWEBKIT_USES_PIXMAPS 334#if !LL_QTWEBKIT_USES_PIXMAPS
330 // don't flip bitmap 335 // don't flip bitmap
@@ -518,7 +523,9 @@ private:
518 LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_href"); 523 LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_href");
519 message.setValue("uri", event.getStringValue()); 524 message.setValue("uri", event.getStringValue());
520 message.setValue("target", event.getStringValue2()); 525 message.setValue("target", event.getStringValue2());
526#if 0 // FIXME (webkit_plugins): error: ‘const class LLEmbeddedBrowserWindowEvent’ has no member named ‘getLinkType’
521 message.setValueU32("target_type", event.getLinkType()); 527 message.setValueU32("target_type", event.getLinkType());
528#endif
522 sendMessage(message); 529 sendMessage(message);
523 } 530 }
524 531