From a6e2201d2cff8fe03c83a75a2766d1ab71d35a21 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 13 Sep 2018 16:24:53 -0400
Subject: [PATCH] DRTVWR-474: Run the new updater in LEAP mode.
---
indra/newview/llappviewer.cpp | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index dd1d4cea393..68bb20386a0 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1130,6 +1130,21 @@ bool LLAppViewer::init()
gGLActive = FALSE;
+#if LL_WINDOWS
+ std::string updater(
+ "\"" + gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "updater.exe") + "\"");
+#elif LL_DARWIN
+ std::string updater(
+ "python \"" + gDirUtilp->add(gDirUtilp->getAppRODataDir(), "updater", "updater.py") + "\"");
+#else
+ std::string updater(
+ "\"" + gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "updater") + "\"");
+#endif
+
+ // Run the updater, specifying LEAP mode. An exception from the updater
+ // should bother us.
+ LLLeap::create("updater process", (updater + " leap"), true);
+
// Iterate over --leap command-line options. But this is a bit tricky: if
// there's only one, it won't be an array at all.
LLSD LeapCommand(gSavedSettings.getLLSD("LeapCommand"));
--
GitLab