From 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Fri, 22 May 2009 09:58:47 +0000 Subject: svn merge -r121194:121210 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1 QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk --- indra/newview/installers/windows/lang_nl.nsi | Bin 7388 -> 7414 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview/installers') diff --git a/indra/newview/installers/windows/lang_nl.nsi b/indra/newview/installers/windows/lang_nl.nsi index c8ffa8bfcd..8884b1e858 100644 Binary files a/indra/newview/installers/windows/lang_nl.nsi and b/indra/newview/installers/windows/lang_nl.nsi differ -- cgit v1.2.3 From 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sun, 21 Jun 2009 08:04:56 +0000 Subject: merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 ignore-dead-branch --- indra/newview/installers/windows/installer_template.nsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/installers') diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 87218008bd..73a548cdc6 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -498,7 +498,8 @@ RMDir "$INSTDIR" IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER FOLDERFOUND: - MessageBox MB_YESNO $(DeleteProgramFilesMB) IDNO NOFOLDER + ; Silent uninstall always removes all files (/SD IDYES) + MessageBox MB_YESNO $(DeleteProgramFilesMB) /SD IDYES IDNO NOFOLDER RMDir /r "$INSTDIR" NOFOLDER: -- cgit v1.2.3