livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-17585 Crash at LLAppViewer::initConfiguration

meow-7.2.2
Andrey Kleshchev 2022-06-16 23:47:26 +03:00
parent ed36165f29
commit 75668d4522
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/installers/windows/installer_template.nsi
View File

@ -622,6 +622,8 @@ Function RemoveProgFilesOnInst
Push $0
StrCpy $0 0
ClearErrors
PREINSTALLREMOVE:
# Remove old SecondLife.exe to invalidate any old shortcuts to it that may be in non-standard locations. See MAINT-3575

18
indra/newview/llappviewer.cpp
View File

@ -2489,10 +2489,24 @@ bool LLAppViewer::initConfiguration()
//Load settings files list
std::string settings_file_list = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "settings_files.xml");
LLXMLNodePtr root;
BOOL success = LLXMLNode::parseFile(settings_file_list, root, NULL);
BOOL success = LLXMLNode::parseFile(settings_file_list, root, NULL);
if (!success)
{
LL_ERRS() << "Cannot load default configuration file " << settings_file_list << LL_ENDL;
LL_WARNS() << "Cannot load default configuration file " << settings_file_list << LL_ENDL;
if (gDirUtilp->fileExists(settings_file_list))
{
LL_ERRS() << "Cannot load default configuration file settings_files.xml. "
<< "Please reinstall viewer from https://secondlife.com/support/downloads/ "
<< "and contact https://support.secondlife.com if issue persists after reinstall."
<< LL_ENDL;
}
else
{
LL_ERRS() << "Default configuration file settings_files.xml not found. "
<< "Please reinstall viewer from https://secondlife.com/support/downloads/ "
<< "and contact https://support.secondlife.com if issue persists after reinstall."
<< LL_ENDL;
}
}
mSettingsLocationList = new SettingsFiles();