diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp index c4a4c74d1ee0d7f7a9d5082f13b7a81314964b5e..cfbc5803c776c20dcc5ab82a3fa07c853ec5eb7c 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-bundle.crt"); + mCAFile = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "app_settings", "ca-bundle.crt" ); } U32 LLDir_Win32::countFilesInDir(const std::string &dirname, const std::string &mask) diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp index 814cfde75da99175867df4f64ecc543f109bb949..a1dbbb307b47f0c662ca2e997b47de9700ab1df0 100644 --- a/indra/newview/llsechandler_basic.cpp +++ b/indra/newview/llsechandler_basic.cpp @@ -1275,7 +1275,7 @@ void LLSecAPIBasicHandler::init() // grab the application ca-bundle.crt file that contains the well-known certs shipped // with the product - std::string ca_file_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt"); + std::string ca_file_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "app_settings", "ca-bundle.crt" ); LL_INFOS("SECAPI") << "Loading application certificate store from " << ca_file_path << LL_ENDL; LLPointer<LLBasicCertificateStore> app_ca_store = new LLBasicCertificateStore(ca_file_path); diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 474f3de66463cb4b9be1ab63b2b7a41cf6bf0286..87ee2f4921c1a2f94e4b039495bb04cbe2edb293 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -2029,7 +2029,7 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type) // the correct way to deal with certs it to load ours from ca-bundle.crt and append them to the ones // Qt/WebKit loads from your system location. - std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "ca-bundle.crt" ); + std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "app_settings", "ca-bundle.crt" ); media_source->addCertificateFilePath( ca_path ); media_source->proxy_setup(gSavedSettings.getBOOL("BrowserProxyEnabled"), gSavedSettings.getString("BrowserProxyAddress"), gSavedSettings.getS32("BrowserProxyPort")); diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index e823228681f2d57d9493ae17557b86a18646f272..493bfac632ae3140f91e5a7954ac613fff567a71 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -595,6 +595,9 @@ def construct(self): self.path("featuretable.txt") self.path("ca-bundle.crt") + with self.prefix(src=pkgdir,dst="app_settings"): + self.path("ca-bundle.crt") + # Media plugins - CEF with self.prefix(src='../media_plugins/cef/%s' % self.args['configuration'], dst="llplugin"): self.path("media_plugin_cef.dll") @@ -1052,6 +1055,9 @@ def construct(self): self.path("SecondLife.nib") self.path("ca-bundle.crt") + with self.prefix(src=pkgdir,dst="app_settings"): + self.path("ca-bundle.crt") + self.path("SecondLife.nib") # Translations @@ -1510,6 +1516,9 @@ def construct(self): self.path("featuretable_linux.txt") self.path("ca-bundle.crt") + with self.prefix(src=pkgdir,dst="app_settings"): + self.path("ca-bundle.crt") + def package_finish(self): installer_name = self.installer_base_name()