diff options
| author | Callum Prentice <callum@gmail.com> | 2017-03-11 18:01:43 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-03-11 18:01:43 -0800 |
| commit | 656457e79b47cf1dd7c34bee1e0ab98ec759f634 (patch) | |
| tree | da37dfed080c4066a78c9d71a51faab9d3e154e7 /indra/newview/installers | |
| parent | 1053c5ca407917c3bc842cbcb80786d43206c5b3 (diff) | |
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)
Diffstat (limited to 'indra/newview/installers')
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 2 |
1 files changed, 1 insertions, 1 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
|