diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-04-05 10:36:41 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-04-05 10:36:41 -0700 |
| commit | 37c15d211b55d979ecea78237b22513ee663eb7a (patch) | |
| tree | 26fd8866ddc859ad7845d4da056b86ffbc5fdc71 /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | 5e486cf21bf8bcd4a40b44d024a19f8318e596bc (diff) | |
| parent | aeac73e45ec6210706dfaee959d8d798c6161c98 (diff) | |
Merge
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") |