diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-02-28 18:28:13 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-02-28 18:28:13 -0800 |
| commit | bf8dee73f90f74f3eb9fd544dc9673defa52817f (patch) | |
| tree | 3e8a711051c699fe96afcfead0e3fd4dc4f19db3 /indra/llvfs/lldir_mac.cpp | |
| parent | c1d2416826406631807f153e7de9d2b790b0caa5 (diff) | |
| parent | e1a76999c3e8aad337d765fcd6eb50c8191409ea (diff) | |
Merge 6.1.1
Diffstat (limited to 'indra/llvfs/lldir_mac.cpp')
| -rw-r--r-- | indra/llvfs/lldir_mac.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 79c4362747..87dc1b9795 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -171,9 +171,9 @@ void LLDir_Mac::initAppDirs(const std::string &app_name, if (!app_read_only_data_dir.empty()) { mAppRODataDir = app_read_only_data_dir; - mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins"; + mSkinBaseDir = add(mAppRODataDir, "skins"); } - mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "../Resources", "ca-bundle.crt"); + mCAFile = add(mAppRODataDir, "ca-bundle.crt"); } std::string LLDir_Mac::getCurPath() |