diff options
| author | Tank_Master <tank.master@phoenixviewer.com> | 2015-02-12 14:33:31 -0800 |
|---|---|---|
| committer | Tank_Master <tank.master@phoenixviewer.com> | 2015-02-12 14:33:31 -0800 |
| commit | 68c94399ed36ec66314e672dafc4afefa9116c00 (patch) | |
| tree | 27b98aeaf79a5eb8a75d3dc0aa270c223366d599 | |
| parent | 4794985d8d210a8e7bc738b620c269222ff25c85 (diff) | |
Backed out changeset: 24c470cccee0 - added SKIP_AUTORUN command flag...
| -rwxr-xr-x | indra/newview/installers/windows/installer_template.nsi | 6 |
1 files changed, 0 insertions, 6 deletions
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
|