Skip to content
Snippets Groups Projects
Commit 616b0a25 authored by alain@945battery-guestA-183.lindenlab.com's avatar alain@945battery-guestA-183.lindenlab.com
Browse files

Updated linux llqtwekit archive and fixed media webkit build and loading (fix CHOP-545).

parent 76c4324b
No related branches found
No related tags found
No related merge requests found
......@@ -1074,9 +1074,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>f53e2a255d4c4039203de3e4640a2d41</string>
<string>ed7d6cb66e6fcd6dbac41aabe6a0d0c8</string>
<key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-linux-20110314.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/224858/arch/Linux/installer/llqtwebkit-4.7.1-linux-20110323.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
......
......@@ -67,7 +67,7 @@ elseif (LINUX)
QtNetwork
QtGui
QtCore
jscore
jpeg
fontconfig
X11
......
......@@ -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")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment