summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-03-23 13:40:56 -0700
committerMerov Linden <merov@lindenlab.com>2011-03-23 13:40:56 -0700
commit976381059e9795c178ee7bb60973557a7323a7a8 (patch)
tree8ad225d2d01ef675319a720889673a1f1d79da28 /indra/media_plugins
parentd3b192c26f2068383b22f15496500c1f961a72e8 (diff)
parent616b0a25686b0ffbc5a995a26f27d5f46efc7024 (diff)
Sync
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/webkit/media_plugin_webkit.cpp4
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")