From b0d01b0a0ad6e4daffe5663fa56d373ea690ed30 Mon Sep 17 00:00:00 2001
From: Tank_Master <tank.master@phoenixviewer.com>
Date: Thu, 12 Feb 2015 14:34:44 -0800
Subject: [PATCH] Backed out changeset: bd12d1ab1943 - MAINT-3591 Remove "Start
Second Life now?" dialogue...
---
.../installers/windows/installer_template.nsi | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 7682d4b9ed2..73e5b8cf74a 100755
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -123,8 +123,24 @@ Var DO_UNINSTALL_V2 # If non-null, path to a previous Viewer 2 installation
Function .onInstSuccess
Call CheckWindowsServPack # Warn if not on the latest SP before asking to launch.
Push $R0 # Option value, unused
+
+ StrCmp $SKIP_DIALOGS "true" label_launch
+
+ ${GetOptions} $COMMANDLINE "/AUTOSTART" $R0
+ # If parameter was there (no error) just launch
+ # Otherwise ask
+ IfErrors label_ask_launch label_launch
+
+label_ask_launch:
+ # Don't launch by default when silent
+ IfSilent label_no_launch
+ MessageBox MB_YESNO $(InstSuccesssQuestion) \
+ IDYES label_launch IDNO label_no_launch
+
+label_launch:
# Assumes SetOutPath $INSTDIR
Exec '"$INSTDIR\$INSTEXE" $SHORTCUT_LANG_PARAM'
+label_no_launch:
Pop $R0
FunctionEnd
--
GitLab