summaryrefslogtreecommitdiff
path: root/indra/llvfs/lldir_win32.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2018-02-14 10:56:31 -0800
committercallum_linden <none@none>2018-02-14 10:56:31 -0800
commit08cb3fbe32b62ed3f53f68633ada9eab44dccb0b (patch)
treecaa4327b04a438978fd9bae207ea86269f1525b6 /indra/llvfs/lldir_win32.cpp
parentb2eb85df79f317d2b587c969178cea9b96c81213 (diff)
parent5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff)
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/llvfs/lldir_win32.cpp')
-rw-r--r--indra/llvfs/lldir_win32.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp
index 5485349c83..c4a4c74d1e 100644
--- a/indra/llvfs/lldir_win32.cpp
+++ b/indra/llvfs/lldir_win32.cpp
@@ -233,7 +233,7 @@ void LLDir_Win32::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.pem");
+ mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
}
U32 LLDir_Win32::countFilesInDir(const std::string &dirname, const std::string &mask)