From cbf983eb399ca249ce5dbcb2b82806c5672c8869 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 9 May 2015 22:49:49 +0200
Subject: [PATCH] Manual Win32 installer merge: Commit e09fc8d9e432 (opps,
 let's make the deletion of the help directory recursive)

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

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index e4720d7898..e51fa917df 100755
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -645,7 +645,7 @@ Push $2
     EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0
     StrCmp $1 "" DONE               # No more users
 
-    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 
+    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath"
     StrCmp $2 "" CONTINUE 0         # "ProfileImagePath" value is missing
 
 # Required since ProfileImagePath is of type REG_EXPAND_SZ
@@ -713,7 +713,7 @@ Delete "$INSTDIR\SecondLife.exe"
 # MAINT-3099 workaround - prevent these log files, if present, from causing a user alert
 Delete "$INSTDIR\VivoxVoiceService-*.log"
 # Remove entire help directory
-RMDir  "$INSTDIR\help"
+RMDir /r  "$INSTDIR\help"
 
 Delete "$INSTDIR\uninst.exe"
 RMDir "$INSTDIR"