diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-16 00:58:44 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-16 00:58:44 +0200 |
| commit | 83b4ea59fc8793ccbfb6b40ffff111de14ebd4d3 (patch) | |
| tree | eab6471412d7094cb265f4a292e910f187560a26 /indra/newview/llappviewer.cpp | |
| parent | aa309c2eef0f3d033ddf8a5096ea1143221a4c71 (diff) | |
| parent | 0b95b9d008a0878b5d57262e529cef61fb29ea24 (diff) | |
Merge branch 'SL-15742' into DRTVWR-527-maint
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 60135cb48a..29a034133e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1188,6 +1188,7 @@ bool LLAppViewer::init() updater.executable = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, updater_file); #elif LL_DARWIN // explicitly run the system Python interpreter on SLVersionChecker.py + // Keep using python2 until SLVersionChecker is converted to python3. updater.executable = "python"; updater_file = "SLVersionChecker.py"; updater.args.add(gDirUtilp->add(gDirUtilp->getAppRODataDir(), "updater", updater_file)); |