diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2017-07-20 10:38:38 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2017-07-20 10:38:38 -0700 |
| commit | b46697fcc155d026b5a951256d53581e7af20036 (patch) | |
| tree | 6e6ba75c6e735c1fe9a8e0fd2515096bf94da8f4 /indra | |
| parent | f7ebaf28b22a2918eead42eaa3610c5b831ddd4d (diff) | |
MAINT-7529: de-Nerf autolaunch after install
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 6fbbf1f1c6..4ca850e30f 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -712,15 +712,15 @@ FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; After install completes, launch app
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-# 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;
+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 '"$WINDIR\explorer.exe" "$INSTDIR\autorun.bat"'
-# Pop $R0
+ Exec '"$WINDIR\explorer.exe" "$INSTDIR\autorun.bat"'
+ Pop $R0
#
-# FunctionEnd
+FunctionEnd
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Recommend Upgrading to Service Pack 1 for Windows 7, if not present
|