diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-08 17:34:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-08 17:34:49 -0400 |
| commit | 51b75b883269a0a78a9428a690324c17abf028c1 (patch) | |
| tree | 56e131516119cf7c6fef2219ca8b8b454ceab0c0 /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | c4ec708922ad5d4a5844b90b8042a939a34733ac (diff) | |
| parent | df329d14a9b882f1bc9c2c598043569ca2688c03 (diff) | |
merge changes for storm-1108
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") |