diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-09-25 13:35:45 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-09-25 13:35:45 -0400 |
| commit | ceb35372b545cd957f99577ad7076c7f3a65cb97 (patch) | |
| tree | 4dfb08a586042d7d98eee4072ac70a1ede5760e2 /indra/llvfs | |
| parent | b51972bac7f0b11955474baebebd3f1d7c9e60e3 (diff) | |
| parent | cc376f86e8496e9e924fd596064c13ee6aa0133e (diff) | |
Automated merge with https://bitbucket.org/oz_linden/viewer-release-cmake3.12
Diffstat (limited to 'indra/llvfs')
| -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() |