From 314d08681415d8474bf4885c80df0a1abafbe78b Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 7 Jun 2022 22:19:17 +0300 Subject: SL-17546 Do not launch updater for a non-interactible instance --- indra/newview/lllogininstance.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/lllogininstance.cpp') diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index a3d0eb5796..e2e5e161c2 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -280,7 +280,9 @@ void LLLoginInstance::constructAuthParams(LLPointer user_credentia mRequestData["options"] = requested_options; mRequestData["http_params"] = http_params; #if LL_RELEASE_FOR_DOWNLOAD - mRequestData["wait_for_updater"] = !gSavedSettings.getBOOL("CmdLineSkipUpdater") && !LLAppViewer::instance()->isUpdaterMissing(); + mRequestData["wait_for_updater"] = !gSavedSettings.getBOOL("CmdLineSkipUpdater") + && !LLAppViewer::instance()->isUpdaterMissing() + && !gNonInteractive; #else mRequestData["wait_for_updater"] = false; #endif -- cgit v1.2.3 From 2efd6727c1c492a178eff42484c35be7c08e5857 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 8 Jun 2022 15:34:12 +0300 Subject: SL-17546 Fix 'release' configuration build tests --- indra/newview/lllogininstance.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/lllogininstance.cpp') diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index e2e5e161c2..82ecfbd4dc 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -280,9 +280,7 @@ void LLLoginInstance::constructAuthParams(LLPointer user_credentia mRequestData["options"] = requested_options; mRequestData["http_params"] = http_params; #if LL_RELEASE_FOR_DOWNLOAD - mRequestData["wait_for_updater"] = !gSavedSettings.getBOOL("CmdLineSkipUpdater") - && !LLAppViewer::instance()->isUpdaterMissing() - && !gNonInteractive; + mRequestData["wait_for_updater"] = LLAppViewer::instance()->waitForUpdater(); #else mRequestData["wait_for_updater"] = false; #endif -- cgit v1.2.3