diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:25:50 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:25:50 +0200 |
| commit | 2ab914a9cdd1ad809879aca05dbf4b624949ecea (patch) | |
| tree | c2eb5d49ad6d0db73cf2374704ede44370910d12 /indra/llvfs/lldir_mac.cpp | |
| parent | de91391bdd71dd7c9634cf9a736e1032d0fe983e (diff) | |
| parent | 36cb6933e6c1ad92e1887503b74a05c32988b0f1 (diff) | |
Merged in lindenlab/viewer-bear
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() |