diff options
author | Aleric Inglewood | 2010-10-15 18:01:07 +0200 |
---|---|---|
committer | Aleric Inglewood | 2010-10-15 18:01:07 +0200 |
commit | 8a62086cb0a9a8ae746bffa57e785cc4ca5be3a5 (patch) | |
tree | 4bcca7fd5648739fe6075235befd6da1dca11380 /linden/indra/media_plugins/webkit/media_plugin_webkit.cpp | |
parent | Add missing semi-colon. (diff) | |
download | meta-impy-8a62086cb0a9a8ae746bffa57e785cc4ca5be3a5.zip meta-impy-8a62086cb0a9a8ae746bffa57e785cc4ca5be3a5.tar.gz meta-impy-8a62086cb0a9a8ae746bffa57e785cc4ca5be3a5.tar.bz2 meta-impy-8a62086cb0a9a8ae746bffa57e785cc4ca5be3a5.tar.xz |
Comment out code to make it compile at all (with the latest llqtwebkit).
Diffstat (limited to 'linden/indra/media_plugins/webkit/media_plugin_webkit.cpp')
-rwxr-xr-x | linden/indra/media_plugins/webkit/media_plugin_webkit.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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 | ||