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/llviewermedia.cpp | |
| parent | 806262c388b8c3d77d3ae69ba9187b27c78a8568 (diff) | |
MAINT-8297 path fix #2
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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")); |