diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-06 07:35:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-06 07:35:29 -0400 |
| commit | 96adfcfaedb2304661df15223a3df7f701b73493 (patch) | |
| tree | 484b3b99cc411a394694721f5b309f07839f1a2a /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | 40e14802e3f5bc78546c8ed38fb1a28e46b0dd7c (diff) | |
| parent | f41cbc0ac85ae328f2701aab23e94c0ef7ab5758 (diff) | |
merge changes for vwr-25269
Diffstat (limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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") |