diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-02-11 14:20:02 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2019-02-11 14:20:02 -0500 |
| commit | 3e17a3c84b6b50f729396d227224129781f9b8d7 (patch) | |
| tree | 9627027405e35b3d0b4fcfbdaf1db0043410328d /indra/newview | |
| parent | 1ff58087a9b4fcc7482079ca88523eace37f264c (diff) | |
SL-10506: Try again to attain desired behavior.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index ff064b5f1e..4f9a1b7804 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -184,9 +184,20 @@ Function .onInit %%ENGAGEREGISTRY%%
-# Setting MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY and
+# SL-10506: Setting MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY and
# MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME should
# read the current location of the install for this version into INSTDIR.
+# However, SL-10506 complains about the resulting behavior, so the logic below
+# is adapted from before we introduced MultiUser.nsh.
+
+# if $0 is empty, this is the first time for this viewer name
+ReadRegStr $0 SHELL_CONTEXT "${INSTNAME_KEY}" ""
+
+# viewer with this name was installed before
+${If} $0 != ""
+ # use the value we got from registry as install location
+ StrCpy $INSTDIR $0
+${EndIf}
Call CheckCPUFlags # Make sure we have SSE2 support
Call CheckWindowsVersion # Don't install On unsupported systems
|