Update: (thanks Drake) MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) by default. Added option to engage 32 or 64 bit registry

indra/newview/installers/windows/installer_template.nsi

@@ -91,6 +91,7 @@ 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)

indra/newview/viewer_manifest.py

@@ -632,8 +632,10 @@ class WindowsManifest(ViewerManifest):
             """
 
         if(self.args['arch'].lower() == 'x86_64'):
+            registry="SetRegView 64"
             program_files="$PROGRAMFILES64"
         else:
+            registry="SetRegView 32"
             program_files="$PROGRAMFILES32"
 
         tempfile = "secondlife_setup_tmp.nsi"
@@ -645,6 +647,7 @@ class WindowsManifest(ViewerManifest):
                 "%%INST_VARS%%":inst_vars_template % substitution_strings,
                 "%%INSTALL_FILES%%":self.nsi_file_commands(True),
                 "%%$PROGRAMFILES%%":program_files,
+                "%%REGISTRY%%":registry,
                 "%%DELETE_FILES%%":self.nsi_file_commands(False)})
 
         # We use the Unicode version of NSIS, available from