diff options
author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-03-02 19:46:06 +0200 |
---|---|---|
committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-03-02 19:46:06 +0200 |
commit | 5a273d430a01cd1a6121f984107a339e32632eb4 (patch) | |
tree | 2de1d1e97fd50b843c91512a1087059e0873ff2e /indra/newview | |
parent | 806262c388b8c3d77d3ae69ba9187b27c78a8568 (diff) |
MAINT-8297 path fix #2
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llsechandler_basic.cpp | 2 | ||||
-rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp index 46921427a1..9ab9e4a1a2 100644 --- a/indra/newview/llsechandler_basic.cpp +++ b/indra/newview/llsechandler_basic.cpp @@ -1275,7 +1275,7 @@ void LLSecAPIBasicHandler::init() // grab the application ca-bundle.crt file that contains the well-known certs shipped // with the product - std::string ca_file_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "ca-bundle.crt" ); + std::string ca_file_path = gDirUtilp->getCAFile(); LL_INFOS("SECAPI") << "Loading application certificate store from " << ca_file_path << LL_ENDL; LLPointer<LLBasicCertificateStore> app_ca_store = new LLBasicCertificateStore(ca_file_path); diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index f216da86b7..f4b5055cd9 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -2029,7 +2029,7 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type) // the correct way to deal with certs it to load ours from ca-bundle.crt and append them to the ones // Qt/WebKit loads from your system location. - std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "ca-bundle.crt" ); + std::string ca_path = gDirUtilp->getCAFile(); media_source->addCertificateFilePath( ca_path ); media_source->proxy_setup(gSavedSettings.getBOOL("BrowserProxyEnabled"), gSavedSettings.getString("BrowserProxyAddress"), gSavedSettings.getS32("BrowserProxyPort")); |