diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-27 12:27:05 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-27 12:27:05 -0400 |
| commit | a3d89650a9a485902982ac066b2a4e9cf642989d (patch) | |
| tree | da1723ade50571e7fe1fe15e43a1b9cb595b5ae5 /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | 71f5c1f5e8bbf6b22776cd7f98aabecc7a48918d (diff) | |
| parent | 154a465bdaff58023c43bed12b4a049ae72a55df (diff) | |
merged .hgtags from viewer-pre-release
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") |