Skip to content
Snippets Groups Projects
Commit bf8b2891 authored by callum's avatar callum
Browse files

SOCIAL-510 FIX SL Profile Pages Seem to be Ignoring Assets

(New version of LLQtWebKit and now load CA.pem)
See also SOCIAL-569 [VWR-24426] SSL Handshake Failed Error when accessing web-based content on development viewers using recent Webkit 4.7
parent 0d9fa286
Branches
Tags
No related merge requests found
...@@ -1833,17 +1833,10 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type) ...@@ -1833,17 +1833,10 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type)
media_source->ignore_ssl_cert_errors(true); media_source->ignore_ssl_cert_errors(true);
} }
// NOTE: Removed as per STORM-927 - SSL handshake failed - setting local self-signed certs like this // the correct way to deal with certs it to load ours from CA.pem and append them to the ones
// seems to screw things up big time. For now, devs will need to add these certs locally and Qt will pick them up. // Qt/WebKit loads from your system location.
// // start by assuming the default CA file will be used std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "CA.pem" );
// std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "lindenlab.pem" ); media_source->addCertificateFilePath( ca_path );
// // default turned off so pick up the user specified path
// if( ! gSavedSettings.getBOOL("BrowserUseDefaultCAFile"))
// {
// ca_path = gSavedSettings.getString("BrowserCAFilePath");
// }
// // set the path to the CA.pem file
// media_source->addCertificateFilePath( ca_path );
media_source->proxy_setup(gSavedSettings.getBOOL("BrowserProxyEnabled"), gSavedSettings.getString("BrowserProxyAddress"), gSavedSettings.getS32("BrowserProxyPort")); media_source->proxy_setup(gSavedSettings.getBOOL("BrowserProxyEnabled"), gSavedSettings.getString("BrowserProxyAddress"), gSavedSettings.getS32("BrowserProxyPort"));
......
...@@ -981,9 +981,9 @@ anguage Infrstructure (CLI) international standard</string> ...@@ -981,9 +981,9 @@ anguage Infrstructure (CLI) international standard</string>
<key>darwin</key> <key>darwin</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>66c46841825ab4969ec875b5c8f9b24c</string> <string>13f9be04ba029d19f822abdcb755c700</string>
<key>url</key> <key>url</key>
<uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-darwin-qt4.7.1-20101221.tar.bz2</uri> <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-darwin-qt4.7.1-20110302.tar.bz2</uri>
</map> </map>
<key>linux</key> <key>linux</key>
<map> <map>
...@@ -995,9 +995,9 @@ anguage Infrstructure (CLI) international standard</string> ...@@ -995,9 +995,9 @@ anguage Infrstructure (CLI) international standard</string>
<key>windows</key> <key>windows</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>b678c4d18ea8e4fab42b20f8d0b2629a</string> <string>7cc9626ff4ac035f8605c996d18ea6a9</string>
<key>url</key> <key>url</key>
<uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.7.1-20101221.tar.bz2</uri> <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.7.1-20110302.tar.bz2</uri>
</map> </map>
</map> </map>
</map> </map>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment