diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-08-22 21:00:44 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-08-22 21:00:44 -0400 |
| commit | 714b911a4045958e985b19e52ec4e17fccf8e183 (patch) | |
| tree | 386d0d05404fe37b4dd42b5d30d77a0c3e67609d | |
| parent | b5dbb9c52aa8f9379662f1ff1169adadcf8ac5f8 (diff) | |
| parent | 90c01387212d45a26571706c572359681f3321ea (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
| -rw-r--r-- | autobuild.xml | 10 | ||||
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/autobuild.xml b/autobuild.xml index f6490b4fba..6a99ff3990 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3150,9 +3150,9 @@ <key>archive</key> <map> <key>hash</key> - <string>333a679f0a492e060b4586eaa1a38a56</string> + <string>4bcf14967862b2bc6fb5e21a98b3f1c3</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7692/29540/viewer_manager-1.0.507681-darwin64-507681.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7923/30899/viewer_manager-1.0.507912-darwin64-507912.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3174,9 +3174,9 @@ <key>archive</key> <map> <key>hash</key> - <string>bf4672af39013418d721327d337ba1a0</string> + <string>e8f724af97da15a5f0bf279b517702b0</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7694/29546/viewer_manager-1.0.507681-windows-507681.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7924/30905/viewer_manager-1.0.507912-windows-507912.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3187,7 +3187,7 @@ <key>source_type</key> <string>hg</string> <key>version</key> - <string>1.0.507681</string> + <string>1.0.507912</string> </map> <key>vlc-bin</key> <map> diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 4ca850e30f..ade808e3e2 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -714,6 +714,13 @@ FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function .onInstSuccess
Call CheckWindowsServPack # Warn if not on the latest SP before asking to launch.
+ ;; $EXEDIR is where we find the installer file
+ ;; Put a marker file there so VMP will know we're done
+ ;; and it can delete the download directory next time.
+ ;; http://nsis.sourceforge.net/Write_text_to_a_file
+ FileOpen $9 "$EXEDIR\nsis.winstall" w
+ FileWrite $9 "NSIS done$\n"
+ FileClose $9
Push $R0 # Option value, unused#
StrCmp $SKIP_AUTORUN "true" +2;
# Assumes SetOutPath $INSTDIR
|