Add option to remove user settings and cache files at uninstall, with message

Removed function to delete use stored password file
Removed no longer used RemoveCacheFilesDP from language files
Added message to English language file for prompt when asking to remove user files
-Note: this needs translations in other languages added

13 files changed, 21 insertions, 32 deletions

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 22a7336858..49500ab80d 100755
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -363,14 +363,9 @@ Delete "$INSTDIR\$INSTSHORTCUT.lnk"
 Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk"

 

 # Clean up cache and log files, but leave them in-place for non AGNI installs.

+Call un.UserSettingsFiles

 

-!ifdef UNINSTALL_SETTINGS

-Call un.DocumentsAndSettingsFolder

-!endif

-

-# Remove stored password on uninstall

-Call un.RemovePassword

-

+# Remove the main instalation directory

 Call un.ProgramFiles

 

 SectionEnd 				

@@ -691,14 +686,17 @@ FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;; Delete files in \Users\<User>\AppData\

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.DocumentsAndSettingsFolder

+Function un.UserSettingsFiles

 

-# Delete files in \Users\<User>\AppData\Roaming\SecondLife

+# Ask if user wants to keep data files or not

+MessageBox MB_YESNO|MB_ICONQUESTION $(RemoveDataFilesMB) IDYES Remove IDNO Keep

+

+Remove:

 Push $0

 Push $1

 Push $2

 

-  DetailPrint "Deleting Second Life files"

+  DetailPrint "Deleting Second Life data files"

 

   StrCpy $0 0	# Index number used to iterate via EnumRegKey

 

@@ -712,15 +710,18 @@ Push $2
 # Required since ProfileImagePath is of type REG_EXPAND_SZ

     ExpandEnvStrings $2 $2

 

+# Delete files in \Users\<User>\AppData\Roaming\SecondLife

 # Remove all settings files but leave any other .txt files to preserve the chat logs

-;    RMDir /r "$2\Application Data\SecondLife\logs"

-    RMDir /r "$2\Application Data\SecondLife\browser_profile"

-    RMDir /r "$2\Application Data\SecondLife\user_settings"

-    Delete  "$2\Application Data\SecondLife\*.xml"

-    Delete  "$2\Application Data\SecondLife\*.bmp"

-    Delete  "$2\Application Data\SecondLife\search_history.txt"

-    Delete  "$2\Application Data\SecondLife\plugin_cookies.txt"

-    Delete  "$2\Application Data\SecondLife\typed_locations.txt"

+;    RMDir /r "$2\AppData\Roaming\SecondLife\logs"

+    RMDir /r "$2\AppData\Roaming\SecondLife\browser_profile"

+    RMDir /r "$2\AppData\Roaming\SecondLife\user_settings"

+    Delete  "$2\AppData\Roaming\SecondLife\*.xml"

+    Delete  "$2\AppData\Roaming\SecondLife\*.bmp"

+    Delete  "$2\AppData\Roaming\SecondLife\search_history.txt"

+    Delete  "$2\AppData\Roaming\SecondLife\plugin_cookies.txt"

+    Delete  "$2\AppData\Roaming\SecondLife\typed_locations.txt"

+# Delete files in \Users\<User>\AppData\Local\SecondLife

+    RmDir /r  "$2\AppData\Local\SecondLife"							#Delete the cache folder

 

   CONTINUE:

     IntOp $0 $0 + 1

@@ -731,26 +732,14 @@ Pop $2
 Pop $1

 Pop $0

 

-# Delete files in Program Data folder

+# Delete files in ProgramData\Secondlife

 Push $0

   ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

   StrCmp $0 "" +2

   RMDir /r "$0\SecondLife"

 Pop $0

 

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; Delete the stored password for the current Windows user

-;; DEV-10821 -- Unauthorised user can gain access to an SL account after a real user has uninstalled

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.RemovePassword

-

-DetailPrint "Removing Second Life password"

-

-SetShellVarContext current

-Delete "$APPDATA\SecondLife\user_settings\password.dat"

-SetShellVarContext all

+Keep:

 

 FunctionEnd

 

diff --git a/indra/newview/installers/windows/lang_da.nsi b/indra/newview/installers/windows/lang_da.nsi
index 1080fd2e3d..83e1a3ea94 100755
--- a/indra/newview/installers/windows/lang_da.nsi
+++ b/indra/newview/installers/windows/lang_da.nsi
diff --git a/indra/newview/installers/windows/lang_de.nsi b/indra/newview/installers/windows/lang_de.nsi
index fd59bf8f71..dbf4bc84bf 100755
--- a/indra/newview/installers/windows/lang_de.nsi
+++ b/indra/newview/installers/windows/lang_de.nsi
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index 4cf605e398..c06e5ac00d 100755
--- a/indra/newview/installers/windows/lang_en-us.nsi
+++ b/indra/newview/installers/windows/lang_en-us.nsi
diff --git a/indra/newview/installers/windows/lang_es.nsi b/indra/newview/installers/windows/lang_es.nsi
index bfc1bf7248..f4f0786332 100755
--- a/indra/newview/installers/windows/lang_es.nsi
+++ b/indra/newview/installers/windows/lang_es.nsi
diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi
index c2ee17fbd4..1b5dbfc975 100755
--- a/indra/newview/installers/windows/lang_fr.nsi
+++ b/indra/newview/installers/windows/lang_fr.nsi
diff --git a/indra/newview/installers/windows/lang_it.nsi b/indra/newview/installers/windows/lang_it.nsi
index cb97335488..a456e6e417 100755
--- a/indra/newview/installers/windows/lang_it.nsi
+++ b/indra/newview/installers/windows/lang_it.nsi
diff --git a/indra/newview/installers/windows/lang_ja.nsi b/indra/newview/installers/windows/lang_ja.nsi
index 3fbf434b6a..fc5f4fabca 100755
--- a/indra/newview/installers/windows/lang_ja.nsi
+++ b/indra/newview/installers/windows/lang_ja.nsi
diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi
index 1564c25293..a172f0cdeb 100755
--- a/indra/newview/installers/windows/lang_pl.nsi
+++ b/indra/newview/installers/windows/lang_pl.nsi
diff --git a/indra/newview/installers/windows/lang_pt-br.nsi b/indra/newview/installers/windows/lang_pt-br.nsi
index 8e858c8742..9ef252d232 100755
--- a/indra/newview/installers/windows/lang_pt-br.nsi
+++ b/indra/newview/installers/windows/lang_pt-br.nsi
diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi
index 8b98ed5032..d7c728d3e2 100755
--- a/indra/newview/installers/windows/lang_ru.nsi
+++ b/indra/newview/installers/windows/lang_ru.nsi
diff --git a/indra/newview/installers/windows/lang_tr.nsi b/indra/newview/installers/windows/lang_tr.nsi
index 7c41811b30..97c602f4fc 100755
--- a/indra/newview/installers/windows/lang_tr.nsi
+++ b/indra/newview/installers/windows/lang_tr.nsi
diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi
index e89a1e7e51..39c005a683 100755
--- a/indra/newview/installers/windows/lang_zh.nsi
+++ b/indra/newview/installers/windows/lang_zh.nsi