summaryrefslogtreecommitdiff
path: root/indra/llvfs/lldir_mac.cpp
diff options
context:
space:
mode:
authorGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-05-18 19:25:54 +0100
committerGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-05-18 19:25:54 +0100
commitc0413250b7e6820b03288bf3bcb035b892870532 (patch)
tree2caad0268e3182e198e7c1fc1564c897ba8c130c /indra/llvfs/lldir_mac.cpp
parent56541379559c61406a4ab322b83be582ecae7806 (diff)
parent64b3473f4920b0340e731e44342e2599ad46d698 (diff)
Merge 5.1.5
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 cecc98bbfd..79c4362747 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-bundle.crt");
+ mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "../Resources", "ca-bundle.crt");
}
std::string LLDir_Mac::getCurPath()