From 182a091ad961fb296aafc974509746a4dff54421 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 27 Sep 2018 17:41:26 -0400 Subject: DRTVWR-474: Pass the leap updater the parameters it requires. --- indra/newview/llappviewer.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5a374755f7..776fc85a2d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1130,21 +1130,29 @@ bool LLAppViewer::init() gGLActive = FALSE; -#if LL_WINDOWS std::vector updater +#if LL_WINDOWS { gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "updater.exe") }; #elif LL_DARWIN // explicitly run the system Python interpreter on updater.py - std::vector updater { "python", gDirUtilp->add(gDirUtilp->getAppRODataDir(), "updater", "updater.py") }; #else - std::vector updater { gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "updater") }; #endif // add LEAP mode command-line argument to whichever of these we selected updater.push_back("leap"); - - // Run the updater. An exception from the updater should bother us. + // UpdaterServiceSettings + updater.push_back(stringize(gSavedSettings.getU32("UpdaterServiceSetting"))); + // channel + updater.push_back(LLVersionInfo::getChannel()); + // testok + updater.push_back(stringize(gSavedSettings.getBOOL("UpdaterWillingToTest"))); + // UpdaterServiceURL + updater.push_back(gSavedSettings.getString("UpdaterServiceURL")); + // ForceAddressSize + updater.push_back(stringize(gSavedSettings.getU32("ForceAddressSize"))); + + // Run the updater. An exception from launching the updater should bother us. LLLeap::create("updater process", updater, true); // Iterate over --leap command-line options. But this is a bit tricky: if -- cgit v1.2.3