diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-09-13 16:20:05 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-09-13 16:20:05 -0400 |
| commit | 289813994eb492d16e3af0fa30835e2b26a84ced (patch) | |
| tree | 0f47ff22c8f31e2b5f2e0b008eb61147d872aaa5 /indra/llvfs | |
| parent | d41245f252442d91432f06b039abea81831cc083 (diff) | |
DRTVWR-474: Clean up use of LLDir::getAppRODataDir(), esp. on Mac.
Clearly it's not obvious to maintainers that on the Mac, getAppRODataDir()
returns the app's Resources directory: in a number of places the code starts
with the executable directory and appends "../Resources" to find that.
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() |