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

Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 

# Conflicts:
#	indra/newview/llappviewer.cpp
master
Ansariel 2023-08-31 18:11:39 +02:00
parent f075bf7599 200696f25c
commit 86c25b8434
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llappviewer.cpp
View File

@ -3518,7 +3518,10 @@ void LLAppViewer::initStrings()
{
// initial check to make sure files are there failed
gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);
LL_ERRS() << "Viewer failed to find localization and UI files. Please reinstall viewer from https://www.firestormviewer.org/downloads and contact https://www.firestormviewer.org/support if issue persists after reinstall." << LL_ENDL;
LL_ERRS() << "Viewer failed to find localization and UI files"
<< " (strings_path_full = '" << strings_path_full << "')."
<< " Please reinstall viewer from https://www.firestormviewer.org/downloads"
<< " and contact https://www.firestormviewer.org/support if issue persists after reinstall." << LL_ENDL;
}
LLTransUtil::parseStrings(strings_file, default_trans_args);
LLTransUtil::parseLanguageStrings("language_settings.xml");

3
indra/newview/llspatialpartition.cpp
View File

@ -4271,7 +4271,8 @@ void LLCullResult::assertDrawMapsEmpty()
{
if (mRenderMapSize[i] != 0)
{
LL_ERRS() << "Stale LLDrawInfo's in LLCullResult!" << LL_ENDL;
LL_ERRS() << "Stale LLDrawInfo's in LLCullResult!"
<< " (mRenderMapSize[" << i << "] = " << mRenderMapSize[i] << ")" << LL_ENDL;
}
}
}