Backed out changeset: 089bc7e7644d

Sun, 15 Apr 2018 17:42:09 -0700

author
Liny <liny@pinkfox.xyz>
date
Sun, 15 Apr 2018 17:42:09 -0700
changeset 55109
0e49f8cd743d
parent 55108
81a5688eec5b
child 55110
4d212265e068

Backed out changeset: 089bc7e7644d
Breaks linux

indra/newview/llsechandler_basic.cpp file | annotate | diff | revisions
indra/newview/llviewermedia.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llsechandler_basic.cpp	Sun Apr 15 23:30:38 2018 +0200
     1.2 +++ b/indra/newview/llsechandler_basic.cpp	Sun Apr 15 17:42:09 2018 -0700
     1.3 @@ -1284,8 +1284,7 @@
     1.4  		
     1.5  		// grab the application ca-bundle.crt file that contains the well-known certs shipped
     1.6  		// with the product
     1.7 -		//std::string ca_file_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
     1.8 -		std::string ca_file_path = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", "ca-bundle.crt"); //<FS:LO> Fix running firestorm from visual studio
     1.9 +		std::string ca_file_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
    1.10  		LL_INFOS("SECAPI") << "Loading application certificate store from " << ca_file_path << LL_ENDL;
    1.11  		LLPointer<LLBasicCertificateStore> app_ca_store = new LLBasicCertificateStore(ca_file_path);
    1.12  		
     2.1 --- a/indra/newview/llviewermedia.cpp	Sun Apr 15 23:30:38 2018 +0200
     2.2 +++ b/indra/newview/llviewermedia.cpp	Sun Apr 15 17:42:09 2018 -0700
     2.3 @@ -1874,8 +1874,7 @@
     2.4  
     2.5  		// the correct way to deal with certs it to load ours from ca-bundle.crt and append them to the ones
     2.6  		// Qt/WebKit loads from your system location.
     2.7 -		//std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "ca-bundle.crt" );
     2.8 -		std::string ca_path = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", "ca-bundle.crt"); //<FS:LO> Fix running firestorm from visual studio
     2.9 +		std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "ca-bundle.crt" );
    2.10  		media_source->addCertificateFilePath( ca_path );
    2.11  
    2.12  		media_source->proxy_setup(gSavedSettings.getBOOL("BrowserProxyEnabled"), gSavedSettings.getString("BrowserProxyAddress"), gSavedSettings.getS32("BrowserProxyPort"));

mercurial