diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-02-28 15:44:56 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-02-28 15:44:56 -0800 |
| commit | 52566e4b333a6f91c04034a6bdcb1e9099371d12 (patch) | |
| tree | c5ed54db8fc7400e4acebed1d3f069092123bbd4 /indra/llvfs/lldir_mac.cpp | |
| parent | da60cc476a9586449728c5b507a5cc8354cdf611 (diff) | |
| parent | 03db2ddc9c27cf842c6185826617b0da0d2b87f5 (diff) | |
Merge
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() |