From a39d330cc22c603d5c06fabe86104e8948573e20 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 3 Dec 2018 20:27:44 +0200
Subject: [PATCH] SL-10152 Uninstaller's offers to delete remaining files is
problematic
---
.../installers/windows/installer_template.nsi | 4 +---
.../newview/installers/windows/lang_en-us.nsi | Bin 8734 -> 8814 bytes
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 14c8dba39f1..d6e4b005dfb 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -651,9 +651,7 @@ RMDir "$INSTDIR"
IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER
FOLDERFOUND:
-# Silent uninstall always removes all files (/SD IDYES)
- MessageBox MB_YESNO $(DeleteProgramFilesMB) /SD IDYES IDNO NOFOLDER
- RMDir /r "$INSTDIR"
+ MessageBox MB_OK $(DeleteProgramFilesMB) /SD IDOK IDOK NOFOLDER
NOFOLDER:
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index 00aa47de690a2a066ab023bccfe05a7559c3c938..f854f5db0605a6250e0f5bdaf2267687ee319dbd 100644
GIT binary patch
delta 169
zcmbQ|^3G+$1=-0B@;sAo$!@9lWJqIBV5nrsXD9{Ic|cl$AqPn2F{Cr3G8BQuQh}@#
zAghES1IWr{&;hawfT~g%5*dntqyj@SSSFbv8^}%s>IJDT0;|nuC<Cj2=~V#g2dO9p
ek~s`H0zj+v7?c=z8MwgMda|IP=;kMKR?Gkc+#<pN
delta 54
zcmaFoGS6kh1=-0x!d#Q@$ZnY|CoMPGN`X(bgdu|=l_8hGo<WI$mw^k6ttSf#if%TM
Hw_*kW;usCB
--
GitLab