diff options
| author | Nicky <nicky.dasmijn@posteo.nl> | 2022-07-21 23:36:06 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@posteo.nl> | 2022-07-21 23:36:06 +0200 |
| commit | 6fdd35d500113b6a9d3f4b15342a1baf1e15fa7c (patch) | |
| tree | 621a3bf5f8bc007bcff6c954cfaa071da61e4344 /indra/newview/llappviewer.cpp | |
| parent | 3f31d0b5a70af4ebf746d40d478b4e948e904a87 (diff) | |
| parent | de017d081ebd1c2176c4c0b63793559d2b30ad00 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 2436bc3315..9ed717ecd3 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1125,7 +1125,8 @@ bool LLAppViewer::init() gGLActive = FALSE; #if LL_RELEASE_FOR_DOWNLOAD - if (!gSavedSettings.getBOOL("CmdLineSkipUpdater")) + // Skip updater if this is a non-interactive instance + if (!gSavedSettings.getBOOL("CmdLineSkipUpdater") && !gNonInteractive) { LLProcess::Params updater; updater.desc = "updater process"; @@ -3146,6 +3147,11 @@ bool LLAppViewer::isUpdaterMissing() return mUpdaterNotFound; } +bool LLAppViewer::waitForUpdater() +{ + return !gSavedSettings.getBOOL("CmdLineSkipUpdater") && !mUpdaterNotFound && !gNonInteractive; +} + void LLAppViewer::writeDebugInfo(bool isStatic) { #if LL_WINDOWS && LL_BUGSPLAT |