merge up to 3.7.25-release

13 files changed, 442 insertions, 675 deletions

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 65581a6781..8c8b4971cf 100755
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; secondlife setup.nsi

-;; Copyright 2004-2011, Linden Research, Inc.

+;; Second Life setup.nsi

+;; Copyright 2004-2015, Linden Research, Inc.

 ;;

 ;; This library is free software; you can redistribute it and/or

 ;; modify it under the terms of the GNU Lesser General Public

@@ -18,26 +18,27 @@
 ;;

 ;; Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

 ;;

-;; NSIS Unicode 2.38.1 or higher required

+;; NSIS Unicode 2.46.5 or higher required

 ;; http://www.scratchpaper.com/

 ;;

-;; Author: James Cook, Don Kjer, Callum Prentice

+;; Author: James Cook, TankMaster Finesmith, Don Kjer, Callum Prentice

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

 

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

 ;; Compiler flags

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

-SetOverwrite on				; overwrite files

-SetCompress auto			; compress iff saves space

-SetCompressor /solid lzma	; compress whole installer as one block

-SetDatablockOptimize off	; only saves us 0.1%, not worth it

-XPStyle on                  ; add an XP manifest to the installer

-RequestExecutionLevel admin	; on Vista we must be admin because we write to Program Files

+SetOverwrite on				# Overwrite files

+SetCompress auto			# Compress if saves space

+SetCompressor /solid lzma	# Compress whole installer as one block

+SetDatablockOptimize off	# Only saves us 0.1%, not worth it

+XPStyle on                  # Add an XP manifest to the installer

+RequestExecutionLevel admin	# For when we write to Program Files

 

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

-;;; Project flags

+;; Project flags

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

 

+# This placeholder is replaced by viewer_manifest.py

 %%VERSION%%

 

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

@@ -72,140 +73,317 @@ LangString LanguageCode ${LANG_RUSSIAN}  "ru"
 LangString LanguageCode ${LANG_TURKISH}  "tr"

 LangString LanguageCode ${LANG_TRADCHINESE}  "zh"

 

-;; this placeholder is replaced by viewer_manifest.py

+# This placeholder is replaced by viewer_manifest.py

 %%INST_VARS%%

 

 Name ${INSTNAME}

 

-SubCaption 0 $(LicenseSubTitleSetup)	; override "license agreement" text

+SubCaption 0 $(LicenseSubTitleSetup)	# Override "license agreement" text

 

-BrandingText " "						; bottom of window text

+BrandingText " "						# Bottom of window text

 Icon          %%SOURCE%%\installers\windows\install_icon.ico

 UninstallIcon %%SOURCE%%\installers\windows\uninstall_icon.ico

-WindowIcon on							; show our icon in left corner

-BGGradient off							; no big background window

-CRCCheck on								; make sure CRC is OK

-InstProgressFlags smooth colored		; new colored smooth look

-ShowInstDetails nevershow				; no details, no "show" button

-SetOverwrite on							; stomp files by default

-AutoCloseWindow true					; after all files install, close window

+WindowIcon on							# Show our icon in left corner

+BGGradient off							# No big background window

+CRCCheck on								# Make sure CRC is OK

+InstProgressFlags smooth colored		# New colored smooth look

+SetOverwrite on							# Overwrite files by default

+AutoCloseWindow true					# After all files install, close window

 

 InstallDir "$PROGRAMFILES\${INSTNAME}"

 InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""

+UninstallText $(UninstallTextMsg)

 DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)

 Page directory dirPre

 Page instfiles

 

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

-;;; Variables

+;; Variables

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

 Var INSTPROG

 Var INSTEXE

 Var INSTSHORTCUT

-Var COMMANDLINE         ; command line passed to this installer, set in .onInit

-Var SHORTCUT_LANG_PARAM ; "--set InstallLanguage de", passes language to viewer

-Var SKIP_DIALOGS        ; set from command line in  .onInit. autoinstall 

-                        ; GUI and the defaults.

-Var SKIP_AUTORUN		; skip automatic launch of viewer after install

-Var DO_UNINSTALL_V2     ; If non-null, path to a previous Viewer 2 installation that will be uninstalled.

-

-;;; Function definitions should go before file includes, because calls to

-;;; DLLs like LangDLL trigger an implicit file include, so if that call is at

-;;; the end of this script NSIS has to decompress the whole installer before 

-;;; it can call the DLL function. JC

-

-!include "FileFunc.nsh"     ; For GetParameters, GetOptions

+Var COMMANDLINE         # Command line passed to this installer, set in .onInit

+Var SHORTCUT_LANG_PARAM # "--set InstallLanguage de", Passes language to viewer

+Var SKIP_DIALOGS        # Set from command line in  .onInit. autoinstall GUI and the defaults.

+Var SKIP_AUTORUN		# Skip automatic launch of the viewer after install

+Var DO_UNINSTALL_V2     # If non-null, path to a previous Viewer 2 installation that will be uninstalled.

+

+# Function definitions should go before file includes, because calls to

+# DLLs like LangDLL trigger an implicit file include, so if that call is at

+# the end of this script NSIS has to decompress the whole installer before 

+# it can call the DLL function. JC

+

+!include "FileFunc.nsh"     # For GetParameters, GetOptions

 !insertmacro GetParameters

 !insertmacro GetOptions

-!include WinVer.nsh			; For OS and SP detection

-!include x64.nsh			; For 64bit OS detection

+!include WinVer.nsh			# For OS and SP detection

 

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

-;;; After install completes, launch app

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

-Function .onInstSuccess

-Call CheckWindowsServPack				; Warn if not on the latest SP before asking to launch.

-    Push $R0	# Option value, unused

-	StrCmp $SKIP_AUTORUN "true" +2;

-	# Assumes SetOutPath $INSTDIR

-	Exec '"$INSTDIR\$INSTEXE" $SHORTCUT_LANG_PARAM'

-	Pop $R0

-FunctionEnd

-

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

-;;; Pre-directory page callback

+;; Pre-directory page callback

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

 Function dirPre

     StrCmp $SKIP_DIALOGS "true" 0 +2

 	Abort

+

 FunctionEnd    

 

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

-; Make sure this computer meets the minimum system requirements.

-; Currently: Windows 32bit XP SP3, 64bit XP SP2 and Server 2003 SP2

+;; Prep Installer Section

+;;

+;; Note: to add new languages, add a language file include to the list 

+;; at the top of this file, add an entry to the menu and then add an 

+;; entry to the language ID selector below

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

-Function CheckWindowsVersion

-  ${If} ${AtMostWin2000}

-    MessageBox MB_OK $(CheckWindowsVersionMB)

+Function .onInit

+Call CheckCPUFlags							# Make sure we have SSE2 support

+Call CheckWindowsVersion					# Don't install On unsupported systems

+    Push $0

+    ${GetParameters} $COMMANDLINE			# Get our command line

+

+    ${GetOptions} $COMMANDLINE "/SKIP_DIALOGS" $0   

+    IfErrors +2 0	# If error jump past setting SKIP_DIALOGS

+        StrCpy $SKIP_DIALOGS "true"

+

+	${GetOptions} $COMMANDLINE "/SKIP_AUTORUN" $0

+	IfErrors +2 0 ; If error jump past setting SKIP_AUTORUN

+		StrCpy $SKIP_AUTORUN "true"

+

+    ${GetOptions} $COMMANDLINE "/LANGID=" $0	# /LANGID=1033 implies US English

+

+# If no language (error), then proceed

+    IfErrors lbl_configure_default_lang

+# No error means we got a language, so use it

+    StrCpy $LANGUAGE $0

+    Goto lbl_return

+

+lbl_configure_default_lang:

+# If we currently have a version of SL installed, default to the language of that install

+# Otherwise don't change $LANGUAGE and it will default to the OS UI language.

+    ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"

+    IfErrors +2 0	# If error skip the copy instruction 

+	StrCpy $LANGUAGE $0

+

+# For silent installs, no language prompt, use default

+    IfSilent lbl_return

+    StrCmp $SKIP_DIALOGS "true" lbl_return

+  

+lbl_build_menu:

+	Push ""

+# Use separate file so labels can be UTF-16 but we can still merge changes into this ASCII file. JC

+    !include "%%SOURCE%%\installers\windows\language_menu.nsi"

+    

+	Push A	# A means auto count languages for the auto count to work the first empty push (Push "") must remain

+	LangDLL::LangDialog $(InstallerLanguageTitle) $(SelectInstallerLanguage)

+	Pop $0

+	StrCmp $0 "cancel" 0 +2

+		Abort

+    StrCpy $LANGUAGE $0

+

+# Save language in registry		

+	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" $LANGUAGE

+lbl_return:

+    Pop $0

+    Return

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; Prep Uninstaller Section

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function un.onInit

+# Read language from registry and set for uninstaller. Key will be removed on successful uninstall

+	ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"

+    IfErrors lbl_end

+	StrCpy $LANGUAGE $0

+lbl_end:

+    Return

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; Checks for CPU valid (must have SSE2 support)

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function CheckCPUFlags

+    Push $1

+    System::Call 'kernel32::IsProcessorFeaturePresent(i) i(10) .r1'

+    IntCmp $1 1 OK_SSE2

+    MessageBox MB_OKCANCEL $(MissingSSE2) /SD IDOK IDOK OK_SSE2

     Quit

-  ${EndIf}

 

-  ${If} ${IsWinXP}

-  ${AndIfNot} ${RunningX64}

-  ${AndIfNot} ${IsServicePack} 3

+  OK_SSE2:

+    Pop $1

+    Return

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; Make sure this computer meets the minimum system requirements.

+;; Currently: Windows Vista SP2

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function CheckWindowsVersion

+  ${If} ${AtMostWin2003}

     MessageBox MB_OK $(CheckWindowsVersionMB)

     Quit

   ${EndIf}

 

-  ${If} ${IsWinXP}

-  ${AndIf} ${RunningX64}

+  ${If} ${IsWinVista}

   ${AndIfNot} ${IsServicePack} 2

     MessageBox MB_OK $(CheckWindowsVersionMB)

     Quit

   ${EndIf}

 

-  ${If} ${IsWin2003}

+  ${If} ${IsWin2008}

   ${AndIfNot} ${IsServicePack} 2

     MessageBox MB_OK $(CheckWindowsVersionMB)

     Quit

   ${EndIf}

+

 FunctionEnd

 

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

-;Recommend Upgrading Service Pack

+;; Install Section

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

-Function CheckWindowsServPack

-  ${If} ${IsWinVista}

-  ${AndIfNot} ${IsServicePack} 2

-    MessageBox MB_OK $(CheckWindowsServPackMB)

-    DetailPrint $(UseLatestServPackDP)

-    Return

-  ${EndIf}

+Section ""

 

-  ${If} ${IsWin2008}

-  ${AndIfNot} ${IsServicePack} 2

-    MessageBox MB_OK $(CheckWindowsServPackMB)

-    DetailPrint $(UseLatestServPackDP)

-    Return

-  ${EndIf}

+SetShellVarContext all			# Install for all users (if you change this, change it in the uninstall as well)

 

-  ${If} ${IsWin7}

-  ${AndIfNot} ${IsServicePack} 1

-    MessageBox MB_OK $(CheckWindowsServPackMB)

-    DetailPrint $(UseLatestServPackDP)

-    Return

-  ${EndIf}

+# Start with some default values.

+StrCpy $INSTPROG "${INSTNAME}"

+StrCpy $INSTEXE "${INSTEXE}"

+StrCpy $INSTSHORTCUT "${SHORTCUT}"

 

-  ${If} ${IsWin2008R2}

-  ${AndIfNot} ${IsServicePack} 1

-    MessageBox MB_OK $(CheckWindowsServPackMB)

-    DetailPrint $(UseLatestServPackDP)

-    Return

-  ${EndIf}

-FunctionEnd

+Call CheckIfAdministrator		# Make sure the user can install/uninstall

+Call CheckIfAlreadyCurrent		# Make sure this version is not already installed

+Call CloseSecondLife			# Make sure Second Life not currently running

+Call CheckNetworkConnection		# Ping secondlife.com

+Call CheckWillUninstallV2		# Check if Second Life is already installed

+

+StrCmp $DO_UNINSTALL_V2 "" PRESERVE_DONE

+PRESERVE_DONE:

+

+Call RemoveProgFilesOnInst		# Remove existing files to prevent certain errors when running the new version of the viewer

+

+# This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py

+%%INSTALL_FILES%%

+

+# Pass the installer's language to the client to use as a default

+StrCpy $SHORTCUT_LANG_PARAM "--set InstallLanguage $(LanguageCode)"

+

+# Shortcuts in start menu

+CreateDirectory	"$SMPROGRAMS\$INSTSHORTCUT"

+SetOutPath "$INSTDIR"

+CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \

+				"$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"

+

+

+WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Create Account.url" \

+				"InternetShortcut" "URL" \

+				"http://join.secondlife.com/"

+WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Your Account.url" \

+				"InternetShortcut" "URL" \

+				"http://www.secondlife.com/account/"

+WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.url" \

+				"InternetShortcut" "URL" \

+                "http://wiki.secondlife.com/wiki/LSL_Portal"

+CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \

+				'"$INSTDIR\uninst.exe"' ''

+

+# Other shortcuts

+SetOutPath "$INSTDIR"

+CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" \

+        "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"

+CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" \

+        "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"

+CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \

+				'"$INSTDIR\uninst.exe"' ''

+

+# Write registry

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut" "$INSTSHORTCUT"

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe" "$INSTEXE"

+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "Publisher" "Linden Research, Inc."

+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "URLInfoAbout" "http://secondlife.com/whatis/"

+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "URLUpdateInfo" "http://secondlife.com/support/downloads/"

+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "HelpLink" "https://support.secondlife.com/contact-support/"

+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG"

+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe"'

+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayVersion" "${VERSION_LONG}"

+WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "EstimatedSize" "0x0001D500"		# ~117 MB

+# BUG-2707 Disable SEHOP for installed viewer.

+WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\$INSTEXE" "DisableExceptionChainValidation" 1

+

+# Write URL registry info

+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(default)" "URL:Second Life"

+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""

+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'

+

+# URL param must be last item passed to viewer, it ignores subsequent params to avoid parameter injection attacks.

+WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$INSTEXE" -url "%1"'

+WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info"(default)" "URL:Second Life"

+WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "URL Protocol" ""

+WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'

+

+# URL param must be last item passed to viewer, it ignores subsequent params to avoid parameter injection attacks.

+WriteRegExpandStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open\command" "" '"$INSTDIR\$INSTEXE" -url "%1"'

+

+# Write out uninstaller

+WriteUninstaller "$INSTDIR\uninst.exe"

+

+# Uninstall existing "Second Life Viewer 2" install if needed.

+StrCmp $DO_UNINSTALL_V2 "" REMOVE_SLV2_DONE

+  ExecWait '"$PROGRAMFILES\SecondLifeViewer2\uninst.exe" /S _?=$PROGRAMFILES\SecondLifeViewer2'

+  Delete "$PROGRAMFILES\SecondLifeViewer2\uninst.exe"	# With _? option above, uninst.exe will be left behind.

+  RMDir "$PROGRAMFILES\SecondLifeViewer2"	# Will remove only if empty.

+

+REMOVE_SLV2_DONE:

+

+SectionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; Uninstall Section

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Section Uninstall

+

+# Start with some default values.

+StrCpy $INSTPROG "${INSTNAME}"

+StrCpy $INSTEXE "${INSTEXE}"

+StrCpy $INSTSHORTCUT "${SHORTCUT}"

+

+# Make sure the user can install/uninstall

+Call un.CheckIfAdministrator

+

+# Uninstall for all users (if you change this, change it in the install as well)

+SetShellVarContext all			

+

+# Make sure we're not running

+Call un.CloseSecondLife

+

+# Clean up registry keys and subkeys (these should all be !defines somewhere)

+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG"

+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"

+# BUG-2707 Remove entry that disabled SEHOP

+DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\$INSTEXE"

+

+# Clean up shortcuts

+Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"

+RMDir  "$SMPROGRAMS\$INSTSHORTCUT"

+

+Delete "$DESKTOP\$INSTSHORTCUT.lnk"

+Delete "$INSTDIR\$INSTSHORTCUT.lnk"

+Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk"

+

+# Remove the main installation directory

+Call un.ProgramFiles

+

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

+Call un.UserSettingsFiles

+

+SectionEnd

 

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

-; Make sure the user can install/uninstall

+;; Make sure the user can install

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

 Function CheckIfAdministrator

     DetailPrint $(CheckAdministratorInstDP)

@@ -216,10 +394,11 @@ Function CheckIfAdministrator
         Quit

 lbl_is_admin:

     Return

+

 FunctionEnd

 

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

-;;

+;; Make sure the user can uninstall

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

 Function un.CheckIfAdministrator

     DetailPrint $(CheckAdministratorUnInstDP)

@@ -230,11 +409,12 @@ Function un.CheckIfAdministrator
         Quit

 lbl_is_admin:

     Return

+

 FunctionEnd

 

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

-; Checks to see if the current version has already been installed (according to the registry).

-; If it has, allow user to bail out of install process.

+;; Checks to see if the current version has already been installed (according to the registry).

+;; If it has, allow user to bail out of install process.

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

 Function CheckIfAlreadyCurrent

     Push $0

@@ -246,26 +426,34 @@ Function CheckIfAlreadyCurrent
 continue_install:

     Pop $0

     Return

+

 FunctionEnd

 	

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

-; Checks for CPU valid (must have SSE2 support)

+;; Function CheckWillUninstallV2               

+;;

+;; If called through auto-update, need to uninstall any existing V2 installation.

+;; Don't want to end up with SecondLifeViewer2 and SecondLifeViewer installations

+;;  existing side by side with no indication on which to use.

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

-Function CheckCPUFlags

-    Push $1

-    System::Call 'kernel32::IsProcessorFeaturePresent(i) i(10) .r1'

-    IntCmp $1 1 OK_SSE2

-    MessageBox MB_OKCANCEL $(MissingSSE2) /SD IDOK IDOK OK_SSE2

-    Quit

+Function CheckWillUninstallV2

+

+  StrCpy $DO_UNINSTALL_V2 ""

+

+  StrCmp $SKIP_DIALOGS "true" 0 CHECKV2_DONE

+  StrCmp $INSTDIR "$PROGRAMFILES\SecondLifeViewer2" CHECKV2_DONE	# Don't uninstall our own install dir.

+  IfFileExists "$PROGRAMFILES\SecondLifeViewer2\uninst.exe" CHECKV2_FOUND CHECKV2_DONE

+

+CHECKV2_FOUND:

+  StrCpy $DO_UNINSTALL_V2 "true"

+

+CHECKV2_DONE:

 

-  OK_SSE2:

-    Pop $1

-    Return

 FunctionEnd

 

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

-; Close the program, if running. Modifies no variables.

-; Allows user to bail out of install process.

+;; Close the program, if running. Modifies no variables.

+;; Allows user to bail out of install process.

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

 Function CloseSecondLife

   Push $0

@@ -291,334 +479,134 @@ Function CloseSecondLife
   DONE:

     Pop $0

     Return

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; Close the program, if running. Modifies no variables.

+;; Allows user to bail out of uninstall process.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function un.CloseSecondLife

+  Push $0

+  FindWindow $0 "Second Life" ""

+  IntCmp $0 0 DONE

+  MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL

+

+  CANCEL_UNINSTALL:

+    Quit

+

+  CLOSE:

+    DetailPrint $(CloseSecondLifeUnInstDP)

+    SendMessage $0 16 0 0

+

+  LOOP:

+	  FindWindow $0 "Second Life" ""

+	  IntCmp $0 0 DONE

+	  Sleep 500

+	  Goto LOOP

+

+  DONE:

+    Pop $0

+    Return

+

 FunctionEnd

 

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

-; Test our connection to secondlife.com

-; Also allows us to count attempted installs by examining web logs.

-; *TODO: Return current SL version info and have installer check

-; if it is up to date.

+;; Test our connection to secondlife.com

+;; Also allows us to count attempted installs by examining web logs.

+;; *TODO: Return current SL version info and have installer check

+;; if it is up to date.

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

 Function CheckNetworkConnection

     Push $0

     Push $1

     Push $2	# Option value for GetOptions

     DetailPrint $(CheckNetworkConnectionDP)

-    ; Look for a tag value from the stub installer, used for statistics

-    ; to correlate installs.  Default to "" if not found on command line.

+# Look for a tag value from the stub installer, used for statistics to correlate installs.

+# Default to "" if not found on command line.

     StrCpy $2 ""

     ${GetOptions} $COMMANDLINE "/STUBTAG=" $2

     GetTempFileName $0

-    !define HTTP_TIMEOUT 5000 ; milliseconds

-    ; Don't show secondary progress bar, this will be quick.

+    !define HTTP_TIMEOUT 5000		# Milliseconds

+# Don't show secondary progress bar, this will be quick.

     NSISdl::download_quiet \

         /TIMEOUT=${HTTP_TIMEOUT} \

         "http://install.secondlife.com/check/?stubtag=$2&version=${VERSION_LONG}" \

         $0

-    Pop $1 ; Return value, either "success", "cancel" or an error message

+    Pop $1		# Return value, either "success", "cancel" or an error message

     ; MessageBox MB_OK "Download result: $1"

     ; Result ignored for now

 	; StrCmp $1 "success" +2

 	;	DetailPrint "Connection failed: $1"

-    Delete $0 ; temporary file

+    Delete $0	# Temporary file

     Pop $2

     Pop $1

     Pop $0

     Return

-FunctionEnd

-

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

-; Function CheckOldExeName

-; Viewer versions < 3.6.12 used the name 'SecondLife.exe'

-; If that name is found in the install folder, delete it to invalidate any

-; old shortcuts to it that may be in non-standard locations, so that the user

-; does not end up running the old version (potentially getting caught in an 

-; infinite update loop). See MAINT-3575

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

-

-Function CheckOldExeName

-  IfFileExists "$INSTDIR\SecondLife.exe" CHECKOLDEXE_FOUND CHECKOLDEXE_DONE

-

-CHECKOLDEXE_FOUND:

-  Delete "$INSTDIR\SecondLife.exe"

-CHECKOLDEXE_DONE:

-FunctionEnd

-

-

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

-; Function CheckWillUninstallV2               

-;

-; If we are being called through auto-update, we need to uninstall any

-; existing V2 installation. Otherwise, we wind up with

-; SecondLifeViewer2 and SecondLifeViewer installations existing side

-; by side no indication which to use.

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

-Function CheckWillUninstallV2

-

-  StrCpy $DO_UNINSTALL_V2 ""

-

-  StrCmp $SKIP_DIALOGS "true" 0 CHECKV2_DONE

-  StrCmp $INSTDIR "$PROGRAMFILES\SecondLifeViewer2" CHECKV2_DONE ; don't uninstall our own install dir.

-  IfFileExists "$PROGRAMFILES\SecondLifeViewer2\uninst.exe" CHECKV2_FOUND CHECKV2_DONE

-

-CHECKV2_FOUND:

-  StrCpy $DO_UNINSTALL_V2 "true"

-

-CHECKV2_DONE:

-

-FunctionEnd

-

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

-; Save user files to temp location

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

-Function PreserveUserFiles

-

-Push $0

-Push $1

-Push $2

-

-    RMDir /r "$TEMP\SecondLifeSettingsBackup"

-    CreateDirectory "$TEMP\SecondLifeSettingsBackup"

-    StrCpy $0 0 ; Index number used to iterate via EnumRegKey

-

-  LOOP:

-    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" 

-    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

-

-    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

-    ExpandEnvStrings $2 $2

-

-    CreateDirectory "$TEMP\SecondLifeSettingsBackup\$0"

-    CopyFiles /SILENT "$2\Application Data\SecondLife\*" "$TEMP\SecondLifeSettingsBackup\$0"

-

-  CONTINUE:

-    IntOp $0 $0 + 1

-    Goto LOOP

-  DONE:

-

-Pop $2

-Pop $1

-Pop $0

-

-; Copy files in Documents and Settings\All Users\SecondLife

-Push $0

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

-    StrCmp $0 "" +2

-    CreateDirectory "$TEMP\SecondLifeSettingsBackup\AllUsers\"

-    CopyFiles /SILENT "$2\Application Data\SecondLife\*" "$TEMP\SecondLifeSettingsBackup\AllUsers\"

-Pop $0

-

-FunctionEnd

-

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

-; Restore user files from temp location

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

-Function RestoreUserFiles

-

-Push $0

-Push $1

-Push $2

-

-    StrCpy $0 0 ; Index number used to iterate via EnumRegKey

-

-  LOOP:

-    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" 

-    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

-

-    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

-    ExpandEnvStrings $2 $2

-

-    CreateDirectory "$2\Application Data\SecondLife\"

-    CopyFiles /SILENT "$TEMP\SecondLifeSettingsBackup\$0\*" "$2\Application Data\SecondLife\" 

-

-  CONTINUE:

-    IntOp $0 $0 + 1

-    Goto LOOP

-  DONE:

-

-Pop $2

-Pop $1

-Pop $0

-

-; Copy files in Documents and Settings\All Users\SecondLife

-Push $0

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

-    StrCmp $0 "" +2

-    CreateDirectory "$2\Application Data\SecondLife\"

-    CopyFiles /SILENT "$TEMP\SecondLifeSettingsBackup\AllUsers\*" "$2\Application Data\SecondLife\" 

-Pop $0

 

 FunctionEnd

 

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

-; Remove temp dirs

+;; Delete files on install if previous install exists to prevent undesired behavior

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

-Function RemoveTempUserFiles

-

-Push $0

-Push $1

-Push $2

+Function RemoveProgFilesOnInst

 

-    StrCpy $0 0 ; Index number used to iterate via EnumRegKey

-

-  LOOP:

-    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" 

-    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

-

-    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

-    ExpandEnvStrings $2 $2

-

-    RMDir /r "$TEMP\SecondLifeSettingsBackup\$0\*"

-

-  CONTINUE:

-    IntOp $0 $0 + 1

-    Goto LOOP

-  DONE:

-

-Pop $2

-Pop $1

-Pop $0

-

-; Copy files in Documents and Settings\All Users\SecondLife

-Push $0

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

-    StrCmp $0 "" +2

-    RMDir /r "$TEMP\SecondLifeSettingsBackup\AllUsers\*"

-Pop $0

-

-FunctionEnd

-

-

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

-; Clobber user files - TEST ONLY

-; This is here for testing, generally not desirable to call it.

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

-;Function ClobberUserFilesTESTONLY

-

-;Push $0

-;Push $1

-;Push $2

-;

-;    StrCpy $0 0 ; Index number used to iterate via EnumRegKey

-;

-;  LOOP:

-;    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" 

-;    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

-;

-;    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

-;    ExpandEnvStrings $2 $2

-;

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

-;

-;  CONTINUE:

-;    IntOp $0 $0 + 1

-;    Goto LOOP

-;  DONE:

-;

-;Pop $2

-;Pop $1

-;Pop $0

-;

-;; Copy files in Documents and Settings\All Users\SecondLife

-;Push $0

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

-;    StrCmp $0 "" +2

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

-;Pop $0

-;

-;FunctionEnd

-

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

-;;; Delete the installed shader files

-;;; Since shaders are in active development, we'll likely need to shuffle them

-;;; around a bit from build to build.  This ensures that shaders that we move

-;;; or rename in the dev tree don't get left behind in the install.

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

-Function RemoveOldShaders

-

-;; Remove old shader files first so fallbacks will work. see DEV-5663

-RMDir /r "$INSTDIR\app_settings\shaders\*"

-

-FunctionEnd

-

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

-;;; Delete the installed XUI files

-;;; We've changed the directory hierarchy for skins, putting all XUI and texture

-;;; files under a specific skin directory, i.e. skins/default/xui/en-us as opposed

-;;; to skins/xui/en-us.  Need to clean up the old path when upgrading

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

-Function RemoveOldXUI

+# Remove old SecondLife.exe to invalidate any old shortcuts to it that may be in non-standard locations. See MAINT-3575

+Delete "$INSTDIR\SecondLife.exe"

 

-;; remove old XUI and texture files

-RmDir /r "$INSTDIR\skins\html"

-RmDir /r "$INSTDIR\skins\xui"

-RmDir /r "$INSTDIR\skins\textures"

-Delete "$INSTDIR\skins\*.txt"

+# Remove old shader files first so fallbacks will work. See DEV-5663

+RMDir /r "$INSTDIR\app_settings\shaders"

 

-FunctionEnd

-

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

-;;; Remove any releasenotes files.

-;;; We are no longer including release notes with the viewer. This will delete

-;;; any that were left behind by an older installer. Delete will not fail if

-;;; the files do not exist

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

-Function RemoveOldReleaseNotes

+# Remove skins folder to clean up files removed during development

+RMDir /r "$INSTDIR\skins"

 

-;; remove releasenotes.txt file from application directory, and the shortcut

-;; from the start menu.

+# We are no longer including release notes with the viewer, so remove them.

 Delete "$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk"

 Delete "$INSTDIR\releasenotes.txt"

 

 FunctionEnd

 

-

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

-; Delete files in Documents and Settings\<user>\SecondLife

-; Delete files in Documents and Settings\All Users\SecondLife

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

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

-Function un.DocumentsAndSettingsFolder

+Function un.UserSettingsFiles

+

+StrCmp $DO_UNINSTALL_V2 "true" Keep			# Don't remove user's settings files on auto upgrade

 

-; Delete files in Documents and Settings\<user>\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 files in Documents and Settings folder"

+  DetailPrint "Deleting Second Life data files"

 

-  StrCpy $0 0 ; Index number used to iterate via EnumRegKey

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

 

   LOOP:

     EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

-    StrCmp $1 "" DONE               ; no more users

+    StrCmp $1 "" DONE               # No more users

 

     ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

-    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

+    StrCmp $2 "" CONTINUE 0         # "ProfileImagePath" value is missing

 

-    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

+# Required since ProfileImagePath is of type REG_EXPAND_SZ

     ExpandEnvStrings $2 $2

 

-        ; Remove all cache and 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"

+# 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\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

@@ -629,82 +617,30 @@ Pop $2
 Pop $1

 Pop $0

 

-; Delete files in Documents and Settings\All Users\SecondLife

+# 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

 

-; Delete files in C:\Windows\Application Data\SecondLife

-; If the user is running on a pre-NT system, Application Data lives here instead of

-; in Documents and Settings.

-RMDir /r "$WINDIR\Application Data\SecondLife"

-

-FunctionEnd

-

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

-; Close the program, if running. Modifies no variables.

-; Allows user to bail out of uninstall process.

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

-Function un.CloseSecondLife

-  Push $0

-  FindWindow $0 "Second Life" ""

-  IntCmp $0 0 DONE

-  MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL

-

-  CANCEL_UNINSTALL:

-    Quit

-

-  CLOSE:

-    DetailPrint $(CloseSecondLifeUnInstDP)

-    SendMessage $0 16 0 0

-

-  LOOP:

-	  FindWindow $0 "Second Life" ""

-	  IntCmp $0 0 DONE

-	  Sleep 500

-	  Goto LOOP

-

-  DONE:

-    Pop $0

-    Return

-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

 

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

-;;; Delete the installed files

-;;; This deletes the uninstall executable, but it works 

-;;; because it is copied to temp directory before running

-;;;

-;;; Note:  You must list all files here, because we only

-;;; want to delete our files, not things users left in the

-;;; application directories.

+;; Delete the installed files

+;; This deletes the uninstall executable, but it works because it is copied to temp directory before running

+;;

+;; Note:  You must list all files here, because we only want to delete our files,

+;; not things users left in the program directory.

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

 Function un.ProgramFiles

 

-;; Remove mozilla file first so recursive directory deletion doesn't get hung up

-Delete "$INSTDIR\app_settings\mozilla\components"

-

-;; This placeholder is replaced by the complete list of files to uninstall by viewer_manifest.py

+# This placeholder is replaced by the complete list of files to uninstall by viewer_manifest.py

 %%DELETE_FILES%%

 

-;; Optional/obsolete files.  Delete won't fail if they don't exist.

+# Optional/obsolete files.  Delete won't fail if they don't exist.

 Delete "$INSTDIR\dronesettings.ini"

 Delete "$INSTDIR\message_template.msg"

 Delete "$INSTDIR\newview.pdb"

@@ -717,19 +653,12 @@ Delete "$INSTDIR\motions\*.lla"
 Delete "$INSTDIR\trial\*.html"

 Delete "$INSTDIR\newview.exe"

 Delete "$INSTDIR\SecondLife.exe"

-;; MAINT-3099 workaround - prevent these log files, if present, from causing a user alert

+

+# MAINT-3099 workaround - prevent these log files, if present, from causing a user alert

 Delete "$INSTDIR\VivoxVoiceService-*.log"

-;; Remove entire help directory

-Delete "$INSTDIR\help\Advanced\*"

-RMDir  "$INSTDIR\help\Advanced"

-Delete "$INSTDIR\help\basics\*"

-RMDir  "$INSTDIR\help\basics"

-Delete "$INSTDIR\help\Concepts\*"

-RMDir  "$INSTDIR\help\Concepts"

-Delete "$INSTDIR\help\welcome\*"

-RMDir  "$INSTDIR\help\welcome"

-Delete "$INSTDIR\help\*"

-RMDir  "$INSTDIR\help"

+

+# Remove entire help directory

+RMDir /r  "$INSTDIR\help"

 

 Delete "$INSTDIR\uninst.exe"

 RMDir "$INSTDIR"

@@ -737,7 +666,7 @@ RMDir "$INSTDIR"
 IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER

 

 FOLDERFOUND:

-  ; Silent uninstall always removes all files (/SD IDYES)

+# Silent uninstall always removes all files (/SD IDYES)

   MessageBox MB_YESNO $(DeleteProgramFilesMB) /SD IDYES IDNO NOFOLDER

   RMDir /r "$INSTDIR"

 

@@ -746,240 +675,78 @@ NOFOLDER:
 FunctionEnd

 

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

-;;; Uninstall settings

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

-UninstallText $(UninstallTextMsg)

-ShowUninstDetails show

-

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

-;;; Uninstall section

+;; After install completes, launch app

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

-Section Uninstall

-

-; Start with some default values.

-StrCpy $INSTPROG "${INSTNAME}"

-StrCpy $INSTEXE "${INSTEXE}"

-StrCpy $INSTSHORTCUT "${SHORTCUT}"

-Call un.CheckIfAdministrator		; Make sure the user can install/uninstall

-

-; uninstall for all users (if you change this, change it in the install as well)

-SetShellVarContext all			

-

-; Make sure we're not running

-Call un.CloseSecondLife

-

-; Clean up registry keys and subkeys (these should all be !defines somewhere)

-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG"

-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"

-

-; Clean up shortcuts

-Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"

-RMDir  "$SMPROGRAMS\$INSTSHORTCUT"

-

-Delete "$DESKTOP\$INSTSHORTCUT.lnk"

-Delete "$INSTDIR\$INSTSHORTCUT.lnk"

-Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk"

-

-; Clean up cache and log files.

-; Leave them in-place for non AGNI installs.

-

-!ifdef UNINSTALL_SETTINGS

-Call un.DocumentsAndSettingsFolder

-!endif

-

-; remove stored password on uninstall

-Call un.RemovePassword

-

-Call un.ProgramFiles

+Function .onInstSuccess

+Call CheckWindowsServPack		# Warn if not on the latest SP before asking to launch.

+	Push $R0					# Option value, unused

+	StrCmp $SKIP_AUTORUN "true" +2;

+# Assumes SetOutPath $INSTDIR

+	Exec '"$WINDIR\explorer.exe" "$INSTDIR\$INSTEXE"'

+	Pop $R0

 

-SectionEnd 				; end of uninstall section

+FunctionEnd

 

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

-;;  Note: to add new languages, add a language file include to the list 

-;;  at the top of this file, add an entry to the menu and then add an 

-;;  entry to the language ID selector below

+;; Recommend Upgrading to Service Pack 1 for Windows 7, if not present

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

-Function .onInit

-Call CheckWindowsVersion		; Don't install On unsupported systems

-    Push $0

-    ${GetParameters} $COMMANDLINE              ; get our command line

-

-    ${GetOptions} $COMMANDLINE "/SKIP_DIALOGS" $0   

-    IfErrors +2 0 ; If error jump past setting SKIP_DIALOGS

-        StrCpy $SKIP_DIALOGS "true"

-

-	${GetOptions} $COMMANDLINE "/SKIP_AUTORUN" $0

-    IfErrors +2 0 ; If error jump past setting SKIP_AUTORUN

-		StrCpy $SKIP_AUTORUN "true"

-

-    ${GetOptions} $COMMANDLINE "/LANGID=" $0   ; /LANGID=1033 implies US English

-

-    ; If no language (error), then proceed

-    IfErrors lbl_configure_default_lang

-    ; No error means we got a language, so use it

-    StrCpy $LANGUAGE $0

-    Goto lbl_return

-

-lbl_configure_default_lang:

-    ; If we currently have a version of SL installed, default to the language of that install

-    ; Otherwise don't change $LANGUAGE and it will default to the OS UI language.

-    ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"

-    IfErrors +2 0 ; If error skip the copy instruction 

-	StrCpy $LANGUAGE $0

-

-    ; For silent installs, no language prompt, use default

-    IfSilent lbl_return

-    StrCmp $SKIP_DIALOGS "true" lbl_return

-  

-lbl_build_menu:

-	Push ""

-    # Use separate file so labels can be UTF-16 but we can still merge changes

-    # into this ASCII file. JC

-    !include "%%SOURCE%%\installers\windows\language_menu.nsi"

-    

-	Push A ; A means auto count languages for the auto count to work the first empty push (Push "") must remain

-	LangDLL::LangDialog $(InstallerLanguageTitle) $(SelectInstallerLanguage)

-	Pop $0

-	StrCmp $0 "cancel" 0 +2

-		Abort

-    StrCpy $LANGUAGE $0

-

-	; save language in registry		

-	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" $LANGUAGE

-lbl_return:

-    Pop $0

+Function CheckWindowsServPack

+  ${If} ${IsWin7}

+  ${AndIfNot} ${IsServicePack} 1

+    MessageBox MB_OK $(CheckWindowsServPackMB)

+    DetailPrint $(UseLatestServPackDP)

     Return

-FunctionEnd

+  ${EndIf}

 

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

-Function un.onInit

-	; read language from registry and set for uninstaller

-    ; Key will be removed on successful uninstall

-	ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"

-    IfErrors lbl_end

-	StrCpy $LANGUAGE $0

-lbl_end:

+  ${If} ${IsWin2008R2}

+  ${AndIfNot} ${IsServicePack} 1

+    MessageBox MB_OK $(CheckWindowsServPackMB)

+    DetailPrint $(UseLatestServPackDP)

     Return

-FunctionEnd

-

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

-;;; MAIN SECTION

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

-Section ""						; (default section)

-

-SetShellVarContext all			; install for all users (if you change this, change it in the uninstall as well)

-

-; Start with some default values.

-StrCpy $INSTPROG "${INSTNAME}"

-StrCpy $INSTEXE "${INSTEXE}"

-StrCpy $INSTSHORTCUT "${SHORTCUT}"

-

-Call CheckCPUFlags				; Make sure we have SSE2 support

-Call CheckIfAdministrator		; Make sure the user can install/uninstall

-Call CheckIfAlreadyCurrent		; Make sure that we haven't already installed this version

-Call CloseSecondLife			; Make sure we're not running

-Call CheckNetworkConnection		; ping secondlife.com

-Call CheckWillUninstallV2		; See if a V2 install exists and will be removed.

-Call CheckOldExeName                    ; Clean up a previous version of the exe

-

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

-StrCmp $DO_UNINSTALL_V2 "" PRESERVE_DONE

-  Call PreserveUserFiles

-PRESERVE_DONE:

-

-;;; Don't remove cache files during a regular install, removing the inventory cache on upgrades results in lots of damage to the servers.

-;Call RemoveCacheFiles			; Installing over removes potentially corrupted

-								; VFS and cache files.

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

-;;; Need to clean out shader files from previous installs to fix DEV-5663

-Call RemoveOldShaders

-

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

-;;; Need to clean out old XUI files that predate skinning

-Call RemoveOldXUI

-

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

-;;; Clear out old releasenotes.txt files. These are now on the public wiki.

-Call RemoveOldReleaseNotes

-

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

-;;; Files

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

-;; This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py

-%%INSTALL_FILES%%

-

-# Pass the installer's language to the client to use as a default

-StrCpy $SHORTCUT_LANG_PARAM "--set InstallLanguage $(LanguageCode)"

-

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

-; Shortcuts in start menu

-CreateDirectory	"$SMPROGRAMS\$INSTSHORTCUT"

-SetOutPath "$INSTDIR"

-CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \

-				"$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"

-

-

-WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Create Account.url" \

-				"InternetShortcut" "URL" \

-				"http://join.secondlife.com/"

-WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Your Account.url" \

-				"InternetShortcut" "URL" \

-				"http://www.secondlife.com/account/"

-WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.url" \

-				"InternetShortcut" "URL" \

-                "http://wiki.secondlife.com/wiki/LSL_Portal"

-CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \

-				'"$INSTDIR\uninst.exe"' ''

-

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

-; Other shortcuts

-SetOutPath "$INSTDIR"

-CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" \

-        "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"

-CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" \

-        "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"

-CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \

-				'"$INSTDIR\uninst.exe"' ''

+  ${EndIf}

 

+FunctionEnd

 

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

-; Write registry

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut" "$INSTSHORTCUT"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe" "$INSTEXE"

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG (remove only)"

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe"'

-

+;; Clobber user files - TEST ONLY

+;; This is here for testing, DO NOT USE UNLESS YOU KNOW WHAT YOU ARE TESTING FOR!

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

-; Write URL registry info

-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(default)" "URL:Second Life"

-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""

-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'

-;; URL param must be last item passed to viewer, it ignores subsequent params

-;; to avoid parameter injection attacks.

-WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$INSTEXE" -url "%1"'

-WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info"(default)" "URL:Second Life"

-WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "URL Protocol" ""

-WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'

-;; URL param must be last item passed to viewer, it ignores subsequent params

-;; to avoid parameter injection attacks.

-WriteRegExpandStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open\command" "" '"$INSTDIR\$INSTEXE" -url "%1"'

-

-; write out uninstaller

-WriteUninstaller "$INSTDIR\uninst.exe"

-

-; Uninstall existing "Second Life Viewer 2" install if needed.

-StrCmp $DO_UNINSTALL_V2 "" REMOVE_SLV2_DONE

-  ExecWait '"$PROGRAMFILES\SecondLifeViewer2\uninst.exe" /S _?=$PROGRAMFILES\SecondLifeViewer2'

-  Delete "$PROGRAMFILES\SecondLifeViewer2\uninst.exe" ; with _? option above, uninst.exe will be left behind.

-  RMDir "$PROGRAMFILES\SecondLifeViewer2" ; will remove only if empty.

-

-  Call RestoreUserFiles

-  Call RemoveTempUserFiles

-REMOVE_SLV2_DONE:

+;Function ClobberUserFilesTESTONLY

 

-; end of default section

-SectionEnd

+;Push $0

+;Push $1

+;Push $2

+;

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

+;

+;  LOOP:

+;    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"

+;    StrCmp $2 "" CONTINUE 0         # "ProfileImagePath" value is missing

+;

+;# Required since ProfileImagePath is of type REG_EXPAND_SZ

+;    ExpandEnvStrings $2 $2

+;

+;    RMDir /r "$2\Application Data\SecondLife\"

+;

+;  CONTINUE:

+;    IntOp $0 $0 + 1

+;    Goto LOOP

+;  DONE:

+;

+;Pop $2

+;Pop $1

+;Pop $0

+;

+;# Copy files in Documents and Settings\All Users\SecondLife

+;Push $0

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

+;    StrCmp $0 "" +2

+;    RMDir /r "$2\Application Data\SecondLife\"

+;Pop $0

+;

+;FunctionEnd

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; EOF  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

diff --git a/indra/newview/installers/windows/lang_da.nsi b/indra/newview/installers/windows/lang_da.nsi
index 2352649b4b..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 397262afe1..866accae99 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 df0d55d9e0..343c312ddc 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 32967a0dfa..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 7c75e25360..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 ce66b61f9f..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 e68830123a..5b1c5f4ce9 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 7883819190..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 eb3fb2386c..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 3b0042fbf5..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 b9be1eab08..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 3c6f6fd289..39c005a683 100755
--- a/indra/newview/installers/windows/lang_zh.nsi
+++ b/indra/newview/installers/windows/lang_zh.nsi