2 files changed, 18 insertions, 5 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index cd867d79b3..4e41d6d083 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -709,13 +709,24 @@ FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 Function .onInstSuccess
 Call CheckWindowsServPack		# Warn if not on the latest SP before asking to launch.
+        Push $R0
+        Push $0
+        ;; MAINT-7812: Only write nsis.winstall file with /marker switch
+        ${GetParameters} $R0
+        ${GetOptionsS} $R0 "/marker" $0
+        ;; If no /marker switch, skip to ClearErrors
+        IfErrors +4 0
         ;; $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
+        FileOpen $0 "$EXEDIR\nsis.winstall" w
+        FileWrite $0 "NSIS done$\n"
+        FileClose $0
+
+        ClearErrors
+        Pop $0
+        Pop $R0
         Push $R0					# Option value, unused# 
         StrCmp $SKIP_AUTORUN "true" +2;
 # Assumes SetOutPath $INSTDIR
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 8b304ee0cd..5cee88ca32 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -292,6 +292,10 @@ class ViewerManifest(LLManifest):
 
 
 class WindowsManifest(ViewerManifest):
+    # We want the platform, per se, for every Windows build to be 'win'. The
+    # VMP will concatenate that with the address_size.
+    build_data_json_platform = 'win'
+
     def final_exe(self):
         return self.app_name_oneword()+".exe"
 
@@ -746,11 +750,9 @@ class Windows_i686_Manifest(WindowsManifest):
     # Although we aren't literally passed ADDRESS_SIZE, we can infer it from
     # the passed 'arch', which is used to select the specific subclass.
     address_size = 32
-    build_data_json_platform = 'win32'
 
 class Windows_x86_64_Manifest(WindowsManifest):
     address_size = 64
-    build_data_json_platform = 'win'
 
 
 class DarwinManifest(ViewerManifest):