From 5c069f43e5776a7956daa5c26a86e9bf0389850b Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Mon, 20 Jun 2011 19:07:47 +0200 Subject: use qt/webkit 4.7.4 on linux --- linden/indra/media_plugins/webkit/media_plugin_webkit.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'linden/indra/media_plugins/webkit') diff --git a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp index 4a00557..2cae8d2 100755 --- a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -81,6 +81,7 @@ extern "C" { #ifdef LL_STANDALONE #include #elif defined(LL_LINUX) + // We don't provide Qt headers for non-standalone, therefore define this here. // Our prebuilt is built with QT_NAMESPACE undefined. #define QT_MANGLE_NAMESPACE(name) name @@ -1156,7 +1157,9 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) std::string url = message_in.getValue("url"); if ( 404 == code ) // browser lib only supports 404 right now { +#if LLQTWEBKIT_API_VERSION < 8 LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url ); +#endif }; } else if(message_name == "set_user_agent") -- cgit v1.1