diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-08-26 16:39:32 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-08-26 16:39:32 +0800 |
| commit | 00dc394684356a21d02a798f9ad098587381d142 (patch) | |
| tree | 707f8829453f432f3f2918c7f194c4ac9252f43f /indra | |
| parent | 7632a78e5eca522c23baf3adf122bd576d013d97 (diff) | |
Certificate authority bundle gets installed too
When I tried using, for example, FBSD system's ca-root-nss.crt, at
runtime, the viewer would fail at downloading textures, avatar names,
and so on. So for now we're still relying on LLCA, it's just get
installed automatically without having to track the file in the viewer
project.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llfilesystem/lldir_linux.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llfilesystem/lldir_linux.cpp b/indra/llfilesystem/lldir_linux.cpp index 300cab39d6..7e8fe157ba 100644 --- a/indra/llfilesystem/lldir_linux.cpp +++ b/indra/llfilesystem/lldir_linux.cpp @@ -209,7 +209,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_EXECUTABLE, "ca-bundle.crt"); + mCAFile = add(mAppRODataDir, "ca-bundle.crt"); } U32 LLDir_Linux::countFilesInDir(const std::string &dirname, const std::string &mask) diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 39764f22a0..43d3060bb9 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -21,6 +21,7 @@ endif (IS_ARTWORK_PRESENT) install(FILES featuretable_linux.txt #featuretable_solaris.txt + ${AUTOBUILD_INSTALL_DIR}/ca-bundle.crt DESTINATION share/${VIEWER_BINARY_NAME} ) |