diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-12-03 20:27:44 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-12-03 20:27:44 +0200 |
| commit | a39d330cc22c603d5c06fabe86104e8948573e20 (patch) | |
| tree | d922090e503146d9fc048bb7c1ff8e6118282a97 | |
| parent | c94e981f40652920a7fb5234a65369bf58d41865 (diff) | |
SL-10152 Uninstaller's offers to delete remaining files is problematic
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 4 | ||||
| -rw-r--r-- | indra/newview/installers/windows/lang_en-us.nsi | bin | 8734 -> 8814 bytes |
2 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 14c8dba39f..d6e4b005df 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 Binary files differindex 00aa47de69..f854f5db06 100644 --- a/indra/newview/installers/windows/lang_en-us.nsi +++ b/indra/newview/installers/windows/lang_en-us.nsi |