summaryrefslogtreecommitdiff
path: root/indra/newview/llsechandler_basic.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-03-02 20:07:22 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-03-02 20:07:22 +0200
commitff4bf1a00e4acdb7391d5563c2079e8c43e41493 (patch)
tree2de1d1e97fd50b843c91512a1087059e0873ff2e /indra/newview/llsechandler_basic.cpp
parent59e7217fbe4b5ee4330d25a5218689131c074b25 (diff)
parent5a273d430a01cd1a6121f984107a339e32632eb4 (diff)
Merged MAINT-8297
Diffstat (limited to 'indra/newview/llsechandler_basic.cpp')
-rw-r--r--indra/newview/llsechandler_basic.cpp2
1 files changed, 1 insertions, 1 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);