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

SL-14914 New release viewer install updated to RC unexpectedly 

Requested behavior: First install of a new viewer should never prompt to update to any RC.
Anfortunately neither viewer nor updater can tell the difference betwen RC and optional release update, so setting updater to download only required updates.
meow-7.2.2
Andrey Kleshchev 2021-04-15 17:35:43 +03:00
parent 18323f019f
commit 4a99fe56d9
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llappviewer.cpp
View File

@ -1172,7 +1172,16 @@ bool LLAppViewer::init()
// add LEAP mode command-line argument to whichever of these we selected
updater.args.add("leap");
// UpdaterServiceSettings
updater.args.add(stringize(gSavedSettings.getU32("UpdaterServiceSetting")));
if (gSavedSettings.getBOOL("FirstLoginThisInstall"))
{
// Befor first login, treat this as 'manual' updates,
// updater won't install anything, but required updates
updater.args.add("0");
}
else
{
updater.args.add(stringize(gSavedSettings.getU32("UpdaterServiceSetting")));
}
// channel
updater.args.add(LLVersionInfo::instance().getChannel());
// testok