diff options
Diffstat (limited to 'linden/indra/media_plugins/webkit/media_plugin_webkit.cpp')
-rwxr-xr-x | linden/indra/media_plugins/webkit/media_plugin_webkit.cpp | 3 |
1 files changed, 3 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 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" { | |||
81 | #ifdef LL_STANDALONE | 81 | #ifdef LL_STANDALONE |
82 | #include <qglobal.h> | 82 | #include <qglobal.h> |
83 | #elif defined(LL_LINUX) | 83 | #elif defined(LL_LINUX) |
84 | |||
84 | // We don't provide Qt headers for non-standalone, therefore define this here. | 85 | // We don't provide Qt headers for non-standalone, therefore define this here. |
85 | // Our prebuilt is built with QT_NAMESPACE undefined. | 86 | // Our prebuilt is built with QT_NAMESPACE undefined. |
86 | #define QT_MANGLE_NAMESPACE(name) name | 87 | #define QT_MANGLE_NAMESPACE(name) name |
@@ -1156,7 +1157,9 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) | |||
1156 | std::string url = message_in.getValue("url"); | 1157 | std::string url = message_in.getValue("url"); |
1157 | if ( 404 == code ) // browser lib only supports 404 right now | 1158 | if ( 404 == code ) // browser lib only supports 404 right now |
1158 | { | 1159 | { |
1160 | #if LLQTWEBKIT_API_VERSION < 8 | ||
1159 | LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url ); | 1161 | LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url ); |
1162 | #endif | ||
1160 | }; | 1163 | }; |
1161 | } | 1164 | } |
1162 | else if(message_name == "set_user_agent") | 1165 | else if(message_name == "set_user_agent") |