summaryrefslogtreecommitdiff
path: root/indra/llvfs/lldir_mac.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2018-04-12 15:22:25 -0700
committercallum_linden <none@none>2018-04-12 15:22:25 -0700
commit6c953d0bde107059db75d01cd30326a31cd0de54 (patch)
treec41563bccdcccc3bb263cca68c12f90ce0dbde88 /indra/llvfs/lldir_mac.cpp
parentbdd7bdf390775860fb26a6c7d0923f45bb20256c (diff)
parent41f4e854732a7c75a813b2e99285cc41bde13e5e (diff)
Automated merge with tip of viewer-release after Viewer Media Update release
Diffstat (limited to 'indra/llvfs/lldir_mac.cpp')
-rw-r--r--indra/llvfs/lldir_mac.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp
index e776b84a12..cecc98bbfd 100644
--- a/indra/llvfs/lldir_mac.cpp
+++ b/indra/llvfs/lldir_mac.cpp
@@ -173,7 +173,7 @@ void LLDir_Mac::initAppDirs(const std::string &app_name,
mAppRODataDir = app_read_only_data_dir;
mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
}
- mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem");
+ mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
}
std::string LLDir_Mac::getCurPath()