From 68c94399ed36ec66314e672dafc4afefa9116c00 Mon Sep 17 00:00:00 2001 From: Tank_Master Date: Thu, 12 Feb 2015 14:33:31 -0800 Subject: Backed out changeset: 24c470cccee0 - added SKIP_AUTORUN command flag... --- indra/newview/installers/windows/installer_template.nsi | 6 ------ 1 file changed, 6 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 96ca83bdda..7682d4b9ed 100755 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -105,7 +105,6 @@ Var COMMANDLINE # Command line passed to this installer, set in .onInit Var SHORTCUT_LANG_PARAM # "--set InstallLanguage de", Passes language to viewer Var SKIP_DIALOGS # Set from command line in .onInit. autoinstall # GUI and the defaults. -Var SKIP_AUTORUN # Skip automatic launch of viewer after install Var DO_UNINSTALL_V2 # If non-null, path to a previous Viewer 2 installation that will be uninstalled. # Function definitions should go before file includes, because calls to @@ -124,7 +123,6 @@ 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_AUTORUN "true" +2; # Assumes SetOutPath $INSTDIR Exec '"$INSTDIR\$INSTEXE" $SHORTCUT_LANG_PARAM' Pop $R0 @@ -785,10 +783,6 @@ Call CheckWindowsVersion # Don't install On unsupported systems IfErrors +2 0 # If error jump past setting SKIP_DIALOGS StrCpy $SKIP_DIALOGS "true" - ${GetOptions} $COMMANDLINE "/SKIP_AUTORUN" $0 - IfErrors +2 0 # If error jump past setting SKIP_AUTORUN - StrCpy $SKIP_AUTORUN "true" - ${GetOptions} $COMMANDLINE "/LANGID=" $0 # /LANGID=1033 implies US English # If no language (error), then proceed -- cgit v1.2.3