From 656457e79b47cf1dd7c34bee1e0ab98ec759f634 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Sat, 11 Mar 2017 18:01:43 -0800
Subject: MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files
 (x86) by default. (Update: call to select registry needs to be inside a
 function)

---
 indra/newview/installers/windows/installer_template.nsi | 2 +-
 indra/newview/viewer_manifest.py                        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 7a135fa53c..a266156a47 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -91,7 +91,6 @@ SetOverwrite on							# Overwrite files by default
 AutoCloseWindow true					# After all files install, close window
 
 InstallDir "%%$PROGRAMFILES%%\${INSTNAME}"
-%%REGISTRY%%
 InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""
 UninstallText $(UninstallTextMsg)
 DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)
@@ -137,6 +136,7 @@ FunctionEnd
 ;; entry to the language ID selector below
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 Function .onInit
+%%ENGAGEREGISTRY%%
 Call CheckCPUFlags							# Make sure we have SSE2 support
 Call CheckWindowsVersion					# Don't install On unsupported systems
     Push $0
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 7ea600f24a..743df609aa 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -632,10 +632,10 @@ class WindowsManifest(ViewerManifest):
             """
 
         if(self.args['arch'].lower() == 'x86_64'):
-            registry="SetRegView 64"
+            engage_registry="SetRegView 64"
             program_files="$PROGRAMFILES64"
         else:
-            registry="SetRegView 32"
+            engage_registry="SetRegView 32"
             program_files="$PROGRAMFILES32"
 
         tempfile = "secondlife_setup_tmp.nsi"
@@ -647,7 +647,7 @@ class WindowsManifest(ViewerManifest):
                 "%%INST_VARS%%":inst_vars_template % substitution_strings,
                 "%%INSTALL_FILES%%":self.nsi_file_commands(True),
                 "%%$PROGRAMFILES%%":program_files,
-                "%%REGISTRY%%":registry,
+                "%%ENGAGEREGISTRY%%":engage_registry,
                 "%%DELETE_FILES%%":self.nsi_file_commands(False)})
 
         # We use the Unicode version of NSIS, available from
-- 
cgit v1.2.3