diff options
| author | simon <none@none> | 2014-04-21 15:37:02 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-21 15:37:02 -0700 |
| commit | 883467a3cc421fca68a25589114e0e3f0538ff0e (patch) | |
| tree | 04c2a4ab5c7c9f9e98d5e8b08d931bfeb77a13d2 /indra | |
| parent | a5a0a0b1362da5d00cc6d09bb841ef6167bb2922 (diff) | |
| parent | 676bad148a72c235ec79742e3f490ca66b4f40d0 (diff) | |
Merge downstream code
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/installers/windows/installer_template.nsi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 4ece83d85a..ad5ab22640 100755 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -106,6 +106,7 @@ 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
@@ -122,6 +123,7 @@ Var DO_UNINSTALL_V2 ; If non-null, path to a previous Viewer 2 installation ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function .onInstSuccess
Push $R0 # Option value, unused
+ StrCmp $SKIP_AUTORUN "true" +2;
# Assumes SetOutPath $INSTDIR
Exec '"$INSTDIR\$INSTEXE" $SHORTCUT_LANG_PARAM'
Pop $R0
@@ -856,7 +858,12 @@ Function .onInit 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
IfErrors lbl_configure_default_lang
; No error means we got a language, so use it
|