diff options
| author | Kadah_Coba <kadah.coba@gmail.com> | 2019-03-04 23:39:30 -0800 |
|---|---|---|
| committer | Kadah_Coba <kadah.coba@gmail.com> | 2019-03-04 23:39:30 -0800 |
| commit | 647ac96b15ac6e0509d0e3672ecf79bfb73be0d5 (patch) | |
| tree | dcfa521f16dc6237bd8451408ec397bfd23a2ca1 /indra/llvfs/lldir_mac.cpp | |
| parent | f0208fa72f2cc980ec9ca2b954a680b94392ffff (diff) | |
| parent | 03db2ddc9c27cf842c6185826617b0da0d2b87f5 (diff) | |
Merged in lindenlab/viewer-release
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() |