From 05da0078c54ce9e24e58db3a4fd26a3f82b08566 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 1 Jun 2024 12:20:13 -0400
Subject: [PATCH] Attempt fix linux
---
indra/llfilesystem/lldir_linux.cpp | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/indra/llfilesystem/lldir_linux.cpp b/indra/llfilesystem/lldir_linux.cpp
index 2041a091c54..37645747700 100644
--- a/indra/llfilesystem/lldir_linux.cpp
+++ b/indra/llfilesystem/lldir_linux.cpp
@@ -205,7 +205,15 @@ 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");
+ std::string ca_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
+ if (!LLFile::isfile(ca_path))
+ {
+ mCAFile = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, ".." ,"app_settings", "ca-bundle.crt");
+ }
+ else
+ {
+ mCAFile = ca_path;
+ }
}
U32 LLDir_Linux::countFilesInDir(const std::string &dirname, const std::string &mask)
--
GitLab