diff options
| author | alain@945battery-guestA-183.lindenlab.com <alain@945battery-guestA-183.lindenlab.com> | 2011-03-23 10:44:39 -0700 |
|---|---|---|
| committer | alain@945battery-guestA-183.lindenlab.com <alain@945battery-guestA-183.lindenlab.com> | 2011-03-23 10:44:39 -0700 |
| commit | 616b0a25686b0ffbc5a995a26f27d5f46efc7024 (patch) | |
| tree | 2892b1966330286b78a87e8fe7a49c5cf9d879e8 /indra | |
| parent | 76c4324b5d083114f5593a1ccc32d1dce32d8efb (diff) | |
Updated linux llqtwekit archive and fixed media webkit build and loading (fix CHOP-545).
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/WebKitLibPlugin.cmake | 2 | ||||
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 8fb717cdb8..6e8f6cec7f 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -67,7 +67,7 @@ elseif (LINUX) QtNetwork QtGui QtCore - + jscore jpeg fontconfig X11 diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index d6f8ae3e16..e24ee6629e 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -1231,7 +1231,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 { - LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url ); +#if LLQTWEBKIT_API_VERSION < 8 + LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url ); +#endif }; } else if(message_name == "set_user_agent") |