diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-23 13:40:56 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-23 13:40:56 -0700 |
| commit | 976381059e9795c178ee7bb60973557a7323a7a8 (patch) | |
| tree | 8ad225d2d01ef675319a720889673a1f1d79da28 | |
| parent | d3b192c26f2068383b22f15496500c1f961a72e8 (diff) | |
| parent | 616b0a25686b0ffbc5a995a26f27d5f46efc7024 (diff) | |
Sync
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/cmake/WebKitLibPlugin.cmake | 2 | ||||
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/autobuild.xml b/autobuild.xml index 1292a02136..0cac539c56 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1074,9 +1074,9 @@ <key>archive</key> <map> <key>hash</key> - <string>f53e2a255d4c4039203de3e4640a2d41</string> + <string>ed7d6cb66e6fcd6dbac41aabe6a0d0c8</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-linux-20110314.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/224858/arch/Linux/installer/llqtwebkit-4.7.1-linux-20110323.tar.bz2</string> </map> <key>name</key> <string>linux</string> 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") |