diff options
author | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
commit | 6c953d0bde107059db75d01cd30326a31cd0de54 (patch) | |
tree | c41563bccdcccc3bb263cca68c12f90ce0dbde88 /indra/llvfs/lldir_solaris.cpp | |
parent | bdd7bdf390775860fb26a6c7d0923f45bb20256c (diff) | |
parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) |
Automated merge with tip of viewer-release after Viewer Media Update release
Diffstat (limited to 'indra/llvfs/lldir_solaris.cpp')
-rw-r--r-- | indra/llvfs/lldir_solaris.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llvfs/lldir_solaris.cpp b/indra/llvfs/lldir_solaris.cpp index d60237bacc..a773a69d44 100644 --- a/indra/llvfs/lldir_solaris.cpp +++ b/indra/llvfs/lldir_solaris.cpp @@ -226,7 +226,7 @@ void LLDir_Solaris::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_Solaris::countFilesInDir(const std::string &dirname, const std::string &mask) |