diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 12:47:19 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 12:47:19 -0400 |
| commit | 2f74cd32791dc9025e1e396b2f535fdfb6b1ca87 (patch) | |
| tree | 6d57ab7f0d3ea7717276fca421e98547d52b5124 /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | 6bee9532207cfabd1c6315ea00fa7703bc401d2c (diff) | |
| parent | a03f6997d8c3519e2c89930a1ed03a787af6f7ae (diff) | |
merge changes for storm-1130
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") |