diff options
author | callum_linden <none@none> | 2018-02-14 10:56:31 -0800 |
---|---|---|
committer | callum_linden <none@none> | 2018-02-14 10:56:31 -0800 |
commit | 08cb3fbe32b62ed3f53f68633ada9eab44dccb0b (patch) | |
tree | caa4327b04a438978fd9bae207ea86269f1525b6 /indra/llvfs/lldir_linux.cpp | |
parent | b2eb85df79f317d2b587c969178cea9b96c81213 (diff) | |
parent | 5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff) |
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/llvfs/lldir_linux.cpp')
-rw-r--r-- | indra/llvfs/lldir_linux.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp index a9f3166d41..5b269eb56b 100644 --- a/indra/llvfs/lldir_linux.cpp +++ b/indra/llvfs/lldir_linux.cpp @@ -208,7 +208,7 @@ void LLDir_Linux::initAppDirs(const std::string &app_name, LL_WARNS() << "Couldn't create LL_PATH_CACHE dir " << getExpandedFilename(LL_PATH_CACHE,"") << LL_ENDL; } - mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem"); + mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt"); } U32 LLDir_Linux::countFilesInDir(const std::string &dirname, const std::string &mask) |