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

storm-1534: code to allow external source of current Linden names

meow-7.2.2
Oz Linden 2011-08-03 15:46:16 -04:00
parent f72f2f2bf6
commit fc0d74a1fe
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llfloaterabout.cpp
View File

@ -110,6 +110,9 @@ BOOL LLFloaterAbout::postBuild()
LLViewerTextEditor *support_widget =
getChild<LLViewerTextEditor>("support_editor", true);
LLViewerTextEditor *linden_names_widget =
getChild<LLViewerTextEditor>("linden_names", true);
LLViewerTextEditor *contrib_names_widget =
getChild<LLViewerTextEditor>("contrib_names", true);
@ -195,6 +198,24 @@ BOOL LLFloaterAbout::postBuild()
support_widget->setEnabled(FALSE);
support_widget->startOfDoc();
// Get the names of Lindens, added by viewer_manifest.py at build time
std::string lindens_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"lindens.txt");
llifstream linden_file;
std::string lindens;
linden_file.open(lindens_path); /* Flawfinder: ignore */
if (linden_file.is_open())
{
std::getline(linden_file, lindens); // all names are on a single line
linden_file.close();
linden_names_widget->setText(lindens);
}
else
{
LL_INFOS("AboutInit") << "Could not read lindens file at " << lindens_path << LL_ENDL;
}
linden_names_widget->setEnabled(FALSE);
linden_names_widget->startOfDoc();
// Get the names of contributors, extracted from .../doc/contributions.txt by viewer_manifest.py at build time
std::string contributors_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"contributors.txt");
llifstream contrib_file;