From 0ca69bb2ebf206705045a72b004e302af1f6d5dd Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Sat, 27 Oct 2018 15:24:24 -0400
Subject: DRTVWR-447: Stop passing UpdaterServiceURL to leap updater.
In fact, mark UpdaterServiceURL as obsolete. (Consumers should consult
build_data.json.)
---
indra/newview/app_settings/settings.xml | 2 +-
indra/newview/llappviewer.cpp | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8722050569..1242d63e8a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13510,7 +13510,7 @@
<key>UpdaterServiceURL</key>
<map>
<key>Comment</key>
- <string>Default location for the updater service.</string>
+ <string>Obsolete; no longer used.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e527b70b0e..bda76c14d1 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1156,8 +1156,6 @@ bool LLAppViewer::init()
updater.args.add(LLVersionInfo::getChannel());
// testok
updater.args.add(stringize(gSavedSettings.getBOOL("UpdaterWillingToTest")));
- // UpdaterServiceURL
- updater.args.add(gSavedSettings.getString("UpdaterServiceURL"));
// ForceAddressSize
updater.args.add(stringize(gSavedSettings.getU32("ForceAddressSize")));
--
cgit v1.2.3