From 1ff58087a9b4fcc7482079ca88523eace37f264c Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Sat, 9 Feb 2019 10:51:00 -0500
Subject: [PATCH] SL-10506: Disregard any previous installation. Start from
 scratch.

---
 indra/newview/installers/windows/installer_template.nsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 4afef4630ca..ff064b5f1e3 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -117,8 +117,9 @@ AutoCloseWindow true					# After all files install, close window
 # expands to !define MULTIUSER_USE_PROGRAMFILES64 or nothing
 %%PROGRAMFILES%%
 # should make MultiUser.nsh initialization read existing INSTDIR from registry
-!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "${INSTNAME_KEY}"
-!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME ""
+## SL-10506: don't
+##!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "${INSTNAME_KEY}"
+##!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME ""
 # Don't set MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY and
 # MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME to cause the installer to
 # write $MultiUser.InstallMode to the registry, because when the user installs
-- 
GitLab