diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-05-29 11:49:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-05-29 11:49:46 -0400 |
| commit | c18a4cb0117b6e865a72a01465606c67a7e3bf6d (patch) | |
| tree | 25abf867eabd03b7804a1e36e9c9af2513636cc7 /indra/llvfs/lldir_linux.cpp | |
| parent | 77344afa8b39b4c1fcebda4de63998a67fd4debb (diff) | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
merge changes for 5.1.4-release
Diffstat (limited to 'indra/llvfs/lldir_linux.cpp')
| -rw-r--r-- | indra/llvfs/lldir_linux.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp index 5b269eb56b..2cd06b81f8 100644 --- a/indra/llvfs/lldir_linux.cpp +++ b/indra/llvfs/lldir_linux.cpp @@ -208,7 +208,7 @@ void LLDir_Linux::initAppDirs(const std::string &app_name, LL_WARNS() << "Couldn't create LL_PATH_CACHE dir " << getExpandedFilename(LL_PATH_CACHE,"") << LL_ENDL; } - mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt"); + mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "ca-bundle.crt"); } U32 LLDir_Linux::countFilesInDir(const std::string &dirname, const std::string &mask) |