From cf36d9d8bc5b9920207e0ce962b7035c546cd979 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 1 Dec 2018 02:50:26 +0100 Subject: [PATCH] Include viewer version in FSData-provided settings defaults, so we don't need to provide an empty file to clear defaults set via a download for an old release --- indra/newview/fsdata.cpp | 2 +- indra/newview/llappviewer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp index dcd4c4c65c..139c869d03 100644 --- a/indra/newview/fsdata.cpp +++ b/indra/newview/fsdata.cpp @@ -306,7 +306,7 @@ void downloadError(LLSD const &aData, std::string const &aURL) void FSData::startDownload() { mFSdataFilename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "fsdata.xml"); - mFSdataDefaultsFilename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "fsdata_defaults.xml"); + mFSdataDefaultsFilename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, llformat("fsdata_defaults.%s.xml", LLVersionInfo::getShortVersion().c_str())); mClientTagsFilename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_list_v2.xml"); { diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index bc3e9d27b1..1cb8f5b815 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2836,7 +2836,7 @@ bool LLAppViewer::initConfiguration() // // load defaults overide here. Can not use settings_files.xml as path is different then above loading of defaults. - std::string fsdata_defaults = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "fsdata_defaults.xml"); + std::string fsdata_defaults = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, llformat("fsdata_defaults.%s.xml", LLVersionInfo::getShortVersion().c_str())); std::string fsdata_global = "Global"; LLControlGroup* settings_group = LLControlGroup::getInstance(fsdata_global); if(settings_group && settings_group->loadFromFile(fsdata_defaults, set_defaults))