From 1d2ded8c5f1893a246fb1b7d7b5f12f451750827 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 17 Aug 2017 18:48:41 -0400
Subject: MAINT-7661: Make NSIS installer place .winstall marker file.

This reduces a timing hole in which one instance of SL_Launcher might place
a .winstall marker file in the download directory and run the downloaded
installer, but another SL_Launcher instance might discover that marker and try
to delete the directory before the NSIS install completes.
---
 indra/newview/installers/windows/installer_template.nsi | 7 +++++++
 1 file changed, 7 insertions(+)

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
-- 
cgit v1.2.3


From 5482890cd1a9aaa9869dbcd9e3f58e85c0854be0 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 18 Aug 2017 14:59:23 -0400
Subject: MAINT-7661: Update VMP to new build 507880.

---
 autobuild.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index d131e78d40..ea85c7dc1f 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3150,9 +3150,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>333a679f0a492e060b4586eaa1a38a56</string>
+              <string>a3f2dc87b579842bc5f693959abc2ecb</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/7891/30766/viewer_manager-1.0.507880-darwin64-507880.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>71bb4d83c08928d02fb014bab9e67d82</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/7892/30772/viewer_manager-1.0.507880-windows-507880.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.507880</string>
       </map>
       <key>vlc-bin</key>
       <map>
-- 
cgit v1.2.3


From cb789b2a572f145e2671171b81ad6c1a99e01c4b Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 18 Aug 2017 21:18:54 -0400
Subject: MAINT-7661: Update to viewer-manager build 507905

---
 autobuild.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index ea85c7dc1f..07613cf870 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3150,9 +3150,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>a3f2dc87b579842bc5f693959abc2ecb</string>
+              <string>12c2441ac37ff41776d8399183b60dad</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7891/30766/viewer_manager-1.0.507880-darwin64-507880.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7916/30853/viewer_manager-1.0.507905-darwin64-507905.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -3174,9 +3174,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>71bb4d83c08928d02fb014bab9e67d82</string>
+              <string>dad69df0a9c19f42ce43871879316df5</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7892/30772/viewer_manager-1.0.507880-windows-507880.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7917/30859/viewer_manager-1.0.507905-windows-507905.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.507880</string>
+        <string>1.0.507905</string>
       </map>
       <key>vlc-bin</key>
       <map>
-- 
cgit v1.2.3


From 90c01387212d45a26571706c572359681f3321ea Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 21 Aug 2017 12:43:04 -0400
Subject: MAINT-7661: Update to viewer-manager build 507912.

---
 autobuild.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 07613cf870..b8829514b7 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3150,9 +3150,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>12c2441ac37ff41776d8399183b60dad</string>
+              <string>4bcf14967862b2bc6fb5e21a98b3f1c3</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7916/30853/viewer_manager-1.0.507905-darwin64-507905.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>dad69df0a9c19f42ce43871879316df5</string>
+              <string>e8f724af97da15a5f0bf279b517702b0</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7917/30859/viewer_manager-1.0.507905-windows-507905.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.507905</string>
+        <string>1.0.507912</string>
       </map>
       <key>vlc-bin</key>
       <map>
-- 
cgit v1.2.3