summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-09-13 16:24:53 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-09-13 16:24:53 -0400
commita6e2201d2cff8fe03c83a75a2766d1ab71d35a21 (patch)
tree1b30343b40c9bd8f2dfdcceb14ff93bdad7a7fc7
parentcc99cd65cf0355f201157d8f71743899af6f2ade (diff)
DRTVWR-474: Run the new updater in LEAP mode.
-rw-r--r--indra/newview/llappviewer.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index dd1d4cea39..68bb20386a 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"));