From 182a091ad961fb296aafc974509746a4dff54421 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 27 Sep 2018 17:41:26 -0400
Subject: DRTVWR-474: Pass the leap updater the parameters it requires.

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llappviewer.cpp           | 18 +++++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8e8cce5787..26572a7917 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4316,6 +4316,17 @@
       <key>Value</key>
       <real>96.0</real>
     </map>
+    <key>ForceAddressSize</key>
+    <map>
+      <key>Comment</key>
+      <string>Force Windows update to 32-bit or 64-bit viewer.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ForceAssetFail</key>
     <map>
       <key>Comment</key>
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<std::string> 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<std::string> updater
 		{ "python", gDirUtilp->add(gDirUtilp->getAppRODataDir(), "updater", "updater.py") };
 #else
-	std::vector<std::string> 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