summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit
diff options
context:
space:
mode:
authoralain@945battery-guestA-183.lindenlab.com <alain@945battery-guestA-183.lindenlab.com>2011-03-23 10:44:39 -0700
committeralain@945battery-guestA-183.lindenlab.com <alain@945battery-guestA-183.lindenlab.com>2011-03-23 10:44:39 -0700
commit616b0a25686b0ffbc5a995a26f27d5f46efc7024 (patch)
tree2892b1966330286b78a87e8fe7a49c5cf9d879e8 /indra/media_plugins/webkit
parent76c4324b5d083114f5593a1ccc32d1dce32d8efb (diff)
Updated linux llqtwekit archive and fixed media webkit build and loading (fix CHOP-545).
Diffstat (limited to 'indra/media_plugins/webkit')
-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")