9 files changed, 1520 insertions, 1501 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index c766533..ff648bf 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,24 @@
 2008-10-14  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * linden/indra/newview/installers/windows/installer_template.nsi:
+        Rebranded Windows-specific installer/support files.
+        Replaced instances of "Second Life" with "Imprudence", etc.
+        * linden/indra/newview/installers/windows/lang_de.nsi:
+        Ditto.
+        * linden/indra/newview/installers/windows/lang_en-us.nsi:
+        Ditto.
+        * linden/indra/newview/installers/windows/lang_ja.nsi:
+        Ditto.
+        * linden/indra/newview/installers/windows/lang_ko.nsi:
+        Ditto.
+        * linden/indra/newview/res/viewerRes.rc:
+        Ditto.
+        * linden/indra/copy_win_scripts/start-client.py: 
+        Ditto.
+        * linden/indra/win_updater/updater.cpp: 
+        Ditto.
+        
+
         * linden/indra/mac_updater/mac_updater.cpp: 
         Rebranded Mac-specific installer/support files.
         Replaced instances of "Second Life" with "Imprudence", etc.
diff --git a/linden/indra/copy_win_scripts/start-client.py b/linden/indra/copy_win_scripts/start-client.py
index 5f7ff2f..ea2b67a 100644..100755
--- a/linden/indra/copy_win_scripts/start-client.py
+++ b/linden/indra/copy_win_scripts/start-client.py
@@ -32,7 +32,7 @@ def start_client(grid, slurl, build_config, my_args):
     f = open("start-client.log", "w")
     print >>f, "Viewer startup arguments:"
     llstart.start("viewer", "../../newview", 
-        "%s/newview/%s/secondlife-bin.exe" % (build_path, build_config),
+        "%s/newview/%s/imprudence-bin.exe" % (build_path, build_config),
         viewer_args, f)
     f.close()
 
diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi
index ec4fd85..9da45dc 100644
--- a/linden/indra/newview/installers/windows/installer_template.nsi
+++ b/linden/indra/newview/installers/windows/installer_template.nsi
@@ -1,984 +1,984 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; secondlife setup.nsi
-;; Copyright 2004-2007, Linden Research, Inc.
-;; For info, see http://www.nullsoft.com/free/nsis/
-;;
-;; NSIS 2.22 or higher required
-;; Author: James Cook, Don Kjer, Callum Prentice
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Detect NSIS compiler version
-!define "NSIS${NSIS_VERSION}"
-!ifdef "NSISv2.02" | "NSISv2.03" | "NSISv2.04" | "NSISv2.05" | "NSISv2.06"
-    ;; before 2.07 defaulted lzma to solid (whole file)
-    SetCompressor lzma
-!else
-    ;; after 2.07 required /solid for whole file compression
-    SetCompressor /solid lzma
-!endif
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Compiler flags
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-SetOverwrite on                         ; overwrite files
-SetCompress auto                        ; compress iff saves space
-SetDatablockOptimize off        ; only saves us 0.1%, not worth it
-XPStyle on                  ; add an XP manifest to the installer
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Project flags
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-%%VERSION%%
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; - language files - one for each language (or flavor thereof)
-;; (these files are in the same place as the nsi template but the python script generates a new nsi file in the 
-;; application directory so we have to add a path to these include files)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-!include "%%SOURCE%%\installers\windows\lang_de.nsi"
-!include "%%SOURCE%%\installers\windows\lang_en-us.nsi"
-!include "%%SOURCE%%\installers\windows\lang_ja.nsi"
-!include "%%SOURCE%%\installers\windows\lang_ko.nsi"
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Tweak for different servers/builds (this placeholder is replaced by viewer_manifest.py)
-%%GRID_VARS%%
-
-Name ${INSTNAME}
-
-SubCaption 0 $(LicenseSubTitleSetup)    ; override "license agreement" text
-
-BrandingText " "                                                ; bottom of window text
-Icon %%SOURCE%%\res\install_icon.ico    ; our custom icon
-UninstallIcon %%SOURCE%%\res\uninstall_icon.ico    ; our custom icon
-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
-
-InstallDir "$PROGRAMFILES\${INSTNAME}"
-InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""
-!ifdef UPDATE
-DirText $(DirectoryChooseTitle) $(DirectoryChooseUpdate)
-!else
-DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)
-!endif
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Variables
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Var INSTPROG
-Var INSTEXE
-Var INSTFLAGS
-Var LANGFLAGS
-Var INSTSHORTCUT
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Sections
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-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 $INSTFLAGS "${INSTFLAGS}"
-StrCpy $INSTPROG "${INSTNAME}"
-StrCpy $INSTEXE "${INSTEXE}"
-StrCpy $INSTSHORTCUT "${SHORTCUT}"
-
-IfSilent +2
-Goto NOT_SILENT
-  Call CheckStartupParams                 ; Figure out where, what and how to install.
-NOT_SILENT:
-Call CheckWindowsVersion                ; warn if on Windows 98/ME
-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 RemoveNSIS                                 ; Check for old NSIS install to remove
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; 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%%
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; If this is a silent update, we don't need to re-create these shortcuts or registry entries.
-IfSilent POST_INSTALL
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Shortcuts in start menu
-CreateDirectory "$SMPROGRAMS\$INSTSHORTCUT"
-SetOutPath "$INSTDIR"
-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \
-                                "$INSTDIR\$INSTEXE" "$INSTFLAGS"
-
-!ifdef MUSEUM
-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum.lnk" \
-
-                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"
-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum Spanish.lnk" \
-
-                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"
-!endif
-
-WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Create Trial Account.url" \
-                                "InternetShortcut" "URL" \
-                                "http://www.secondlife.com/registration/"
-WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Your Account.url" \
-                                "InternetShortcut" "URL" \
-                                "http://www.secondlife.com/account/"
-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.lnk" \
-                                "$INSTDIR\lsl_guide.html"
-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \
-                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Other shortcuts
-SetOutPath "$INSTDIR"
-CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"
-CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"
-CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \
-                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'
-
-!ifdef MUSEUM
-CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"
-
-CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"
-
-CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"
-
-CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"
-
-!endif
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; 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" "Flags" "$INSTFLAGS"
-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" /P="$INSTPROG"'
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; 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"'
-WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$INSTEXE" $INSTFLAGS -url "%1"'
-
-Goto WRITE_UNINST
-
-POST_INSTALL:
-; Run a post-executable script if necessary.
-Call PostInstallExe
-
-WRITE_UNINST:
-; write out uninstaller
-WriteUninstaller "$INSTDIR\uninst.exe"
-
-; end of default section
-SectionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; PostInstallExe
-; This just runs any post installation scripts.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function PostInstallExe
-push $0
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "PostInstallExe"
-  ;MessageBox MB_OK '$0'
-  ExecWait '$0'
-pop $0
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; CheckStartupParameters
-; Sets INSTFLAGS, INSTPROG, and INSTEXE.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CheckStartupParams
-push $0
-push $R0
-
-  ; Look for a registry entry with info about where to update.
-  Call GetProgramName
-  pop $R0
-  StrCpy $INSTPROG "$R0"
-  StrCpy $INSTEXE "$R0.exe"
-
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""
-  ; If key doesn't exist, skip install
-  IfErrors ABORT
-  StrCpy $INSTDIR "$0"
-
-  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"
-  IfErrors +2
-  StrCpy $INSTFLAGS "$0"
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"
-  IfErrors +2
-  StrCpy $INSTSHORTCUT "$0"
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"
-  IfErrors +2
-  StrCpy $INSTEXE "$0"
-  Goto FINISHED
-
-ABORT:
-  MessageBox MB_OK $(CheckStartupParamsMB)
-  Quit
-
-FINISHED:
-  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"
-pop $R0
-pop $0
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.CheckStartupParams
-push $0
-push $R0
-
-  ; Look for a registry entry with info about where to update.
-  Call un.GetProgramName
-  pop $R0
-  StrCpy $INSTPROG "$R0"
-  StrCpy $INSTEXE "$R0.exe"
-
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""
-  ; If key doesn't exist, skip install
-  IfErrors ABORT
-  StrCpy $INSTDIR "$0"
-
-  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"
-  IfErrors +2
-  StrCpy $INSTFLAGS "$0"
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"
-  IfErrors +2
-  StrCpy $INSTSHORTCUT "$0"
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"
-  IfErrors +2
-  StrCpy $INSTEXE "$0"
-  Goto FINISHED
-
-ABORT:
-  MessageBox MB_OK $(CheckStartupParamsMB)
-  Quit
-
-FINISHED:
-  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"
-pop $R0
-pop $0
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; After install completes, offer readme file
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function .onInstSuccess
-        MessageBox MB_YESNO \
-        $(InstSuccesssQuestion) /SD IDYES IDNO NoReadme
-                ; Assumes SetOutPath $INSTDIR
-                Exec '"$INSTDIR\$INSTEXE" $INSTFLAGS'
-        NoReadme:
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Remove old NSIS version. Modifies no variables.
-; Does NOT delete the LindenWorld directory, or any
-; user files in that directory.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function RemoveNSIS
-  Push $0
-  ; Grab the installation directory of the old version
-  DetailPrint $(RemoveOldNSISVersion)
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""
-
-  ; If key doesn't exist, skip uninstall
-  IfErrors NO_NSIS
-
-  ; Clean up legacy beta shortcuts
-  Delete "$SMPROGRAMS\Second Life Beta.lnk"
-  Delete "$DESKTOP\Second Life Beta.lnk"
-  Delete "$SMPROGRAMS\Second Life.lnk"
-  
-  ; Clean up old newview.exe file
-  Delete "$INSTDIR\newview.exe"
-
-  ; Intentionally don't delete the stuff in
-  ; Documents and Settings, so we keep the user's settings
-
-  NO_NSIS:
-  Pop $0
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Make sure we're not on Windows 98 / ME
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CheckWindowsVersion
-        DetailPrint "Checking Windows version..."
-        Call GetWindowsVersion
-        Pop $R0
-        ; Just get first two characters, ignore 4.0 part of "NT 4.0"
-        StrCpy $R0 $R0 2
-        ; Blacklist certain OS versions
-        StrCmp $R0 "95" win_ver_bad
-        StrCmp $R0 "98" win_ver_bad
-        StrCmp $R0 "ME" win_ver_bad
-        StrCmp $R0 "NT" win_ver_bad
-        Return
-win_ver_bad:
-        MessageBox MB_YESNO $(CheckWindowsVersionMB) IDNO win_ver_abort
-        Return
-win_ver_abort:
-        Quit
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Make sure the user can install/uninstall
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CheckIfAdministrator
-                DetailPrint $(CheckAdministratorInstDP)
-         UserInfo::GetAccountType
-         Pop $R0
-         StrCmp $R0 "Admin" is_admin
-         MessageBox MB_OK $(CheckAdministratorInstMB)
-         Quit
-is_admin:
-         Return
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.CheckIfAdministrator
-        DetailPrint $(CheckAdministratorUnInstDP)
-         UserInfo::GetAccountType
-         Pop $R0
-         StrCmp $R0 "Admin" is_admin
-         MessageBox MB_OK $(CheckAdministratorUnInstMB)
-         Quit
-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.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CheckIfAlreadyCurrent
-  Push $0
-        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version"
-    StrCmp $0 ${VERSION_LONG} 0 DONE
-        MessageBox MB_OKCANCEL $(CheckIfCurrentMB) /SD IDOK IDOK DONE
-    Quit
-
-  DONE:
-    Pop $0
-    Return
-FunctionEnd
-        
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Close the program, if running. Modifies no variables.
-; Allows user to bail out of install process.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CloseSecondLife
-  Push $0
-  FindWindow $0 "Second Life" ""
-  IntCmp $0 0 DONE
-  MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL
-
-  CANCEL_INSTALL:
-    Quit
-
-  CLOSE:
-    DetailPrint $(CloseSecondLifeInstDP)
-    SendMessage $0 16 0 0
-
-  LOOP:
-          FindWindow $0 "Second Life" ""
-          IntCmp $0 0 DONE
-          Sleep 500
-          Goto LOOP
-
-  DONE:
-    Pop $0
-    Return
-FunctionEnd
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Delete files in Documents and Settings\<user>\SecondLife\cache
-; Delete files in Documents and Settings\All Users\SecondLife\cache
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;Function RemoveCacheFiles
-;
-;; Delete files in Documents and Settings\<user>\SecondLife
-;Push $0
-;Push $1
-;Push $2
-;  DetailPrint $(RemoveCacheFilesDP)
-;
-;  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
-;
-;       ; When explicitly uninstalling, everything goes away
-;    RMDir /r "$2\Application Data\SecondLife\cache"
-;
-;  CONTINUE:
-;    IntOp $0 $0 + 1
-;    Goto LOOP
-;  DONE:
-;Pop $2
-;Pop $1
-;Pop $0
-;
-;; Delete 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 "$0\SecondLife\cache"
-;Pop $0
-;
-;; Delete filse 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\cache"
-;
-;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 XUI and texture files
-RmDir /r "$INSTDIR\skins\html"
-RmDir /r "$INSTDIR\skins\xui"
-RmDir /r "$INSTDIR\skins\textures"
-Delete "$INSTDIR\skins\*.txt"
-
-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 releasenotes.txt file from application directory, and the shortcut
-;; from the start menu.
-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
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.DocumentsAndSettingsFolder
-
-; Delete files in Documents and Settings\<user>\SecondLife
-Push $0
-Push $1
-Push $2
-
-  DetailPrint "Deleting files in Documents and Settings folder"
-
-  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
-
-        ; If uninstalling a normal install remove everything
-        ; Otherwise (preview/dmz etc) just remove cache
-    StrCmp $INSTFLAGS "" RM_ALL RM_CACHE
-      RM_ALL:
-        RMDir /r "$2\Application Data\SecondLife"
-        GoTo CONTINUE
-      RM_CACHE:
-        RMDir /r "$2\Application Data\SecondLife\Cache"
-        Delete "$2\Application Data\SecondLife\user_settings\settings_windlight.xml"
-
-  CONTINUE:
-    IntOp $0 $0 + 1
-    Goto LOOP
-  DONE:
-
-Pop $2
-Pop $1
-Pop $0
-
-; Delete 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 "$0\SecondLife"
-Pop $0
-
-; Delete filse 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
-
-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.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-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
-%%DELETE_FILES%%
-
-;; 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"
-Delete "$INSTDIR\newview.map"
-Delete "$INSTDIR\SecondLife.pdb"
-Delete "$INSTDIR\SecondLife.map"
-Delete "$INSTDIR\comm.dat"
-Delete "$INSTDIR\*.glsl"
-Delete "$INSTDIR\motions\*.lla"
-Delete "$INSTDIR\trial\*.html"
-Delete "$INSTDIR\newview.exe"
-;; 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"
-
-Delete "$INSTDIR\uninst.exe"
-RMDir "$INSTDIR"
-
-IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER
-
-FOLDERFOUND:
-  MessageBox MB_YESNO $(DeleteProgramFilesMB) IDNO NOFOLDER
-  RMDir /r "$INSTDIR"
-
-NOFOLDER:
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Uninstall settings
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-UninstallText $(UninstallTextMsg)
-ShowUninstDetails show
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Uninstall section
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Section Uninstall
-
-; Start with some default values.
-StrCpy $INSTFLAGS ""
-StrCpy $INSTPROG "${INSTNAME}"
-StrCpy $INSTEXE "${INSTEXE}"
-StrCpy $INSTSHORTCUT "${SHORTCUT}"
-Call un.CheckStartupParams              ; Figure out where, what and how to uninstall.
-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 (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"
-DeleteRegKey HKEY_LOCAL_MACHINE "Software\Linden Research, Inc.\Installer Language" 
-
-; 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
-
-SectionEnd                              ; end of uninstall section
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; (From the NSIS wiki, DK)
-; GetParameterValue
-;
-; Usage:
-; !insertmacro GetParameterValue "/L=" "1033"
-; pop $R0
-;
-; Returns on top of stack
-;
-; Example command lines:
-; foo.exe /S /L=1033 /D=C:\Program Files\Foo
-; or:
-; foo.exe /S "/L=1033" /D="C:\Program Files\Foo"
-; gpv "/L=" "1033"
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
- !macro GetParameterValue SWITCH DEFAULT
-   Push $0
-   Push $1
-   Push $2
-   Push $3
-   Push $4
-
- ;$CMDLINE='"My Setup\Setup.exe" /L=1033 /S'
-   Push "$CMDLINE"
-   Push '${SWITCH}"'
-   !insertmacro StrStr
-   Pop $0
-   StrCmp "$0" "" gpv_notquoted
- ;$0='/L="1033" /S'
-   StrLen $2 "$0"
-   Strlen $1 "${SWITCH}"
-   IntOp $1 $1 + 1
-   StrCpy $0 "$0" $2 $1
- ;$0='1033" /S'
-   Push "$0"
-   Push '"'
-   !insertmacro StrStr
-   Pop $1
-   StrLen $2 "$0"
-   StrLen $3 "$1"
-   IntOp $4 $2 - $3
-   StrCpy $0 $0 $4 0
-   Goto gpv_done
-
-   gpv_notquoted:
-   Push "$CMDLINE"
-   Push "${SWITCH}"
-   !insertmacro StrStr
-   Pop $0
-   StrCmp "$0" "" gpv_done
- ;$0='/L="1033" /S'
-   StrLen $2 "$0"
-   Strlen $1 "${SWITCH}"
-   StrCpy $0 "$0" $2 $1
- ;$0=1033 /S'
-   Push "$0"
-   Push ' '
-   !insertmacro StrStr
-   Pop $1
-   StrLen $2 "$0"
-   StrLen $3 "$1"
-   IntOp $4 $2 - $3
-   StrCpy $0 $0 $4 0
-   Goto gpv_done
-
-   gpv_done:
-   StrCmp "$0" "" 0 +2
-   StrCpy $0 "${DEFAULT}"
-
-   Pop $4
-   Pop $3
-   Pop $2
-   Pop $1
-   Exch $0
- !macroend
-
-; And I had to modify StrStr a tiny bit.
-; Possible upgrade switch the goto's to use ${__LINE__}
-
-!macro STRSTR
-  Exch $R1 ; st=haystack,old$R1, $R1=needle
-  Exch    ; st=old$R1,haystack
-  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
-  Push $R3
-  Push $R4
-  Push $R5
-  StrLen $R3 $R1
-  StrCpy $R4 0
-  ; $R1=needle
-  ; $R2=haystack
-  ; $R3=len(needle)
-  ; $R4=cnt
-  ; $R5=tmp
- ;  loop;
-    StrCpy $R5 $R2 $R3 $R4
-    StrCmp $R5 $R1 +4
-    StrCmp $R5 "" +3
-    IntOp $R4 $R4 + 1
-    Goto -4
- ;  done;
-  StrCpy $R1 $R2 "" $R4
-  Pop $R5
-  Pop $R4
-  Pop $R3
-  Pop $R2
-  Exch $R1
-!macroend
-
-Function GetProgramName
-  !insertmacro GetParameterValue "/P=" "SecondLife"
-FunctionEnd
-
-Function un.GetProgramName
-  !insertmacro GetParameterValue "/P=" "SecondLife"
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; (From the NSIS documentation, JC)
-; GetWindowsVersion
-;
-; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/
-; Updated by Joost Verburg
-;
-; Returns on top of stack
-;
-; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003)
-; or
-; '' (Unknown Windows Version)
-;
-; Usage:
-;   Call GetWindowsVersion
-;   Pop $R0
-;   ; at this point $R0 is "NT 4.0" or whatnot
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function GetWindowsVersion
- 
-   Push $R0
-   Push $R1
- 
-   ReadRegStr $R0 HKLM \
-   "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-
-   IfErrors 0 lbl_winnt
-   
-   ; we are not NT
-   ReadRegStr $R0 HKLM \
-   "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber
- 
-   StrCpy $R1 $R0 1
-   StrCmp $R1 '4' 0 lbl_error
- 
-   StrCpy $R1 $R0 3
- 
-   StrCmp $R1 '4.0' lbl_win32_95
-   StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98
- 
-   lbl_win32_95:
-     StrCpy $R0 '95'
-   Goto lbl_done
- 
-   lbl_win32_98:
-     StrCpy $R0 '98'
-   Goto lbl_done
- 
-   lbl_win32_ME:
-     StrCpy $R0 'ME'
-   Goto lbl_done
- 
-   lbl_winnt:
- 
-   StrCpy $R1 $R0 1
- 
-   StrCmp $R1 '3' lbl_winnt_x
-   StrCmp $R1 '4' lbl_winnt_x
- 
-   StrCpy $R1 $R0 3
- 
-   StrCmp $R1 '5.0' lbl_winnt_2000
-   StrCmp $R1 '5.1' lbl_winnt_XP
-   StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error
- 
-   lbl_winnt_x:
-     StrCpy $R0 "NT $R0" 6
-   Goto lbl_done
- 
-   lbl_winnt_2000:
-     Strcpy $R0 '2000'
-   Goto lbl_done
- 
-   lbl_winnt_XP:
-     Strcpy $R0 'XP'
-   Goto lbl_done
- 
-   lbl_winnt_2003:
-     Strcpy $R0 '2003'
-   Goto lbl_done
- 
-   lbl_error:
-     Strcpy $R0 ''
-   lbl_done:
- 
-   Pop $R1
-   Exch $R0
- 
-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
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function .onInit
-
-        ; read the language from registry (ok if not there) and set langauge menu
-        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"
-        StrCpy $LANGUAGE $0
-
-        Push ""
-        Push ${LANG_ENGLISH}
-        Push English
-        Push ${LANG_GERMAN}
-        Push German
-        Push ${LANG_JAPANESE}
-        Push Japanese
-        Push ${LANG_KOREAN}
-        Push Korean
-        Push A ; A means auto count languages for the auto count to work the first empty push (Push "") must remain
-        LangDLL::LangDialog "Installer Language" "Please select the language of the installer"
-        Pop $LANGUAGE
-        StrCmp $LANGUAGE "cancel" 0 +2
-                Abort
-
-        ; save language in registry             
-        WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" $LANGUAGE
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.onInit
-
-        ; read language from registry and set for ininstaller
-        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"
-        StrCpy $LANGUAGE $0
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; EOF  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; imprudence setup.nsi

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

+;; For info, see http://www.nullsoft.com/free/nsis/

+;;

+;; NSIS 2.22 or higher required

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

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

+

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

+;;; Detect NSIS compiler version

+!define "NSIS${NSIS_VERSION}"

+!ifdef "NSISv2.02" | "NSISv2.03" | "NSISv2.04" | "NSISv2.05" | "NSISv2.06"

+    ;; before 2.07 defaulted lzma to solid (whole file)

+    SetCompressor lzma

+!else

+    ;; after 2.07 required /solid for whole file compression

+    SetCompressor /solid lzma

+!endif

+

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

+;; Compiler flags

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

+SetOverwrite on                         ; overwrite files

+SetCompress auto                        ; compress iff saves space

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

+XPStyle on                  ; add an XP manifest to the installer

+

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

+;;; Project flags

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

+

+%%VERSION%%

+

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

+;; - language files - one for each language (or flavor thereof)

+;; (these files are in the same place as the nsi template but the python script generates a new nsi file in the 

+;; application directory so we have to add a path to these include files)

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

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

+!include "%%SOURCE%%\installers\windows\lang_en-us.nsi"

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

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

+

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

+;; Tweak for different servers/builds (this placeholder is replaced by viewer_manifest.py)

+%%GRID_VARS%%

+

+Name ${INSTNAME}

+

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

+

+BrandingText " "                                                ; bottom of window text

+Icon %%SOURCE%%\res\install_icon.ico    ; our custom icon

+UninstallIcon %%SOURCE%%\res\uninstall_icon.ico    ; our custom icon

+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

+

+InstallDir "$PROGRAMFILES\${INSTNAME}"

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

+!ifdef UPDATE

+DirText $(DirectoryChooseTitle) $(DirectoryChooseUpdate)

+!else

+DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)

+!endif

+

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

+;;; Variables

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

+Var INSTPROG

+Var INSTEXE

+Var INSTFLAGS

+Var LANGFLAGS

+Var INSTSHORTCUT

+

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

+;;; Sections

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

+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 $INSTFLAGS "${INSTFLAGS}"

+StrCpy $INSTPROG "${INSTNAME}"

+StrCpy $INSTEXE "${INSTEXE}"

+StrCpy $INSTSHORTCUT "${SHORTCUT}"

+

+IfSilent +2

+Goto NOT_SILENT

+  Call CheckStartupParams                 ; Figure out where, what and how to install.

+NOT_SILENT:

+Call CheckWindowsVersion                ; warn if on Windows 98/ME

+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 RemoveNSIS                                 ; Check for old NSIS install to remove

+

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

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

+

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

+; If this is a silent update, we don't need to re-create these shortcuts or registry entries.

+IfSilent POST_INSTALL

+

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

+; Shortcuts in start menu

+CreateDirectory "$SMPROGRAMS\$INSTSHORTCUT"

+SetOutPath "$INSTDIR"

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

+                                "$INSTDIR\$INSTEXE" "$INSTFLAGS"

+

+!ifdef MUSEUM

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

+

+                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

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

+

+                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

+!endif

+

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

+                                "InternetShortcut" "URL" \

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

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

+                                "InternetShortcut" "URL" \

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

+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.lnk" \

+                                "$INSTDIR\lsl_guide.html"

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

+                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'

+

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

+; Other shortcuts

+SetOutPath "$INSTDIR"

+CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"

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

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

+                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'

+

+!ifdef MUSEUM

+CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

+

+CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

+

+CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

+

+CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

+

+!endif

+

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

+; 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" "Flags" "$INSTFLAGS"

+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" /P="$INSTPROG"'

+

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

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

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

+

+Goto WRITE_UNINST

+

+POST_INSTALL:

+; Run a post-executable script if necessary.

+Call PostInstallExe

+

+WRITE_UNINST:

+; write out uninstaller

+WriteUninstaller "$INSTDIR\uninst.exe"

+

+; end of default section

+SectionEnd

+

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

+; PostInstallExe

+; This just runs any post installation scripts.

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

+Function PostInstallExe

+push $0

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "PostInstallExe"

+  ;MessageBox MB_OK '$0'

+  ExecWait '$0'

+pop $0

+FunctionEnd

+

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

+; CheckStartupParameters

+; Sets INSTFLAGS, INSTPROG, and INSTEXE.

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

+Function CheckStartupParams

+push $0

+push $R0

+

+  ; Look for a registry entry with info about where to update.

+  Call GetProgramName

+  pop $R0

+  StrCpy $INSTPROG "$R0"

+  StrCpy $INSTEXE "$R0.exe"

+

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

+  ; If key doesn't exist, skip install

+  IfErrors ABORT

+  StrCpy $INSTDIR "$0"

+

+  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"

+  IfErrors +2

+  StrCpy $INSTFLAGS "$0"

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"

+  IfErrors +2

+  StrCpy $INSTSHORTCUT "$0"

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"

+  IfErrors +2

+  StrCpy $INSTEXE "$0"

+  Goto FINISHED

+

+ABORT:

+  MessageBox MB_OK $(CheckStartupParamsMB)

+  Quit

+

+FINISHED:

+  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"

+pop $R0

+pop $0

+FunctionEnd

+

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

+;;

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

+Function un.CheckStartupParams

+push $0

+push $R0

+

+  ; Look for a registry entry with info about where to update.

+  Call un.GetProgramName

+  pop $R0

+  StrCpy $INSTPROG "$R0"

+  StrCpy $INSTEXE "$R0.exe"

+

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

+  ; If key doesn't exist, skip install

+  IfErrors ABORT

+  StrCpy $INSTDIR "$0"

+

+  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"

+  IfErrors +2

+  StrCpy $INSTFLAGS "$0"

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"

+  IfErrors +2

+  StrCpy $INSTSHORTCUT "$0"

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"

+  IfErrors +2

+  StrCpy $INSTEXE "$0"

+  Goto FINISHED

+

+ABORT:

+  MessageBox MB_OK $(CheckStartupParamsMB)

+  Quit

+

+FINISHED:

+  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"

+pop $R0

+pop $0

+FunctionEnd

+

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

+;;; After install completes, offer readme file

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

+Function .onInstSuccess

+        MessageBox MB_YESNO \

+        $(InstSuccesssQuestion) /SD IDYES IDNO NoReadme

+                ; Assumes SetOutPath $INSTDIR

+                Exec '"$INSTDIR\$INSTEXE" $INSTFLAGS'

+        NoReadme:

+FunctionEnd

+

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

+; Remove old NSIS version. Modifies no variables.

+; Does NOT delete the LindenWorld directory, or any

+; user files in that directory.

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

+Function RemoveNSIS

+  Push $0

+  ; Grab the installation directory of the old version

+  DetailPrint $(RemoveOldNSISVersion)

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

+

+  ; If key doesn't exist, skip uninstall

+  IfErrors NO_NSIS

+

+  ; Clean up legacy beta shortcuts

+  Delete "$SMPROGRAMS\Second Life Beta.lnk"

+  Delete "$DESKTOP\Second Life Beta.lnk"

+  Delete "$SMPROGRAMS\Second Life.lnk"

+  

+  ; Clean up old newview.exe file

+  Delete "$INSTDIR\newview.exe"

+

+  ; Intentionally don't delete the stuff in

+  ; Documents and Settings, so we keep the user's settings

+

+  NO_NSIS:

+  Pop $0

+FunctionEnd

+

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

+; Make sure we're not on Windows 98 / ME

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

+Function CheckWindowsVersion

+        DetailPrint "Checking Windows version..."

+        Call GetWindowsVersion

+        Pop $R0

+        ; Just get first two characters, ignore 4.0 part of "NT 4.0"

+        StrCpy $R0 $R0 2

+        ; Blacklist certain OS versions

+        StrCmp $R0 "95" win_ver_bad

+        StrCmp $R0 "98" win_ver_bad

+        StrCmp $R0 "ME" win_ver_bad

+        StrCmp $R0 "NT" win_ver_bad

+        Return

+win_ver_bad:

+        MessageBox MB_YESNO $(CheckWindowsVersionMB) IDNO win_ver_abort

+        Return

+win_ver_abort:

+        Quit

+FunctionEnd

+

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

+; Make sure the user can install/uninstall

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

+Function CheckIfAdministrator

+                DetailPrint $(CheckAdministratorInstDP)

+         UserInfo::GetAccountType

+         Pop $R0

+         StrCmp $R0 "Admin" is_admin

+         MessageBox MB_OK $(CheckAdministratorInstMB)

+         Quit

+is_admin:

+         Return

+FunctionEnd

+

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

+;;

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

+Function un.CheckIfAdministrator

+        DetailPrint $(CheckAdministratorUnInstDP)

+         UserInfo::GetAccountType

+         Pop $R0

+         StrCmp $R0 "Admin" is_admin

+         MessageBox MB_OK $(CheckAdministratorUnInstMB)

+         Quit

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

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

+Function CheckIfAlreadyCurrent

+  Push $0

+        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version"

+    StrCmp $0 ${VERSION_LONG} 0 DONE

+        MessageBox MB_OKCANCEL $(CheckIfCurrentMB) /SD IDOK IDOK DONE

+    Quit

+

+  DONE:

+    Pop $0

+    Return

+FunctionEnd

+        

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

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

+; Allows user to bail out of install process.

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

+Function CloseSecondLife

+  Push $0

+  FindWindow $0 "Imprudence" ""

+  IntCmp $0 0 DONE

+  MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL

+

+  CANCEL_INSTALL:

+    Quit

+

+  CLOSE:

+    DetailPrint $(CloseSecondLifeInstDP)

+    SendMessage $0 16 0 0

+

+  LOOP:

+          FindWindow $0 "Imprudence" ""

+          IntCmp $0 0 DONE

+          Sleep 500

+          Goto LOOP

+

+  DONE:

+    Pop $0

+    Return

+FunctionEnd

+

+

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

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

+; Delete files in Documents and Settings\All Users\SecondLife\cache

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

+;Function RemoveCacheFiles

+;

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

+;Push $0

+;Push $1

+;Push $2

+;  DetailPrint $(RemoveCacheFilesDP)

+;

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

+;

+;       ; When explicitly uninstalling, everything goes away

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

+;

+;  CONTINUE:

+;    IntOp $0 $0 + 1

+;    Goto LOOP

+;  DONE:

+;Pop $2

+;Pop $1

+;Pop $0

+;

+;; Delete 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 "$0\SecondLife\cache"

+;Pop $0

+;

+;; Delete filse 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\cache"

+;

+;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 XUI and texture files

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

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

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

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

+

+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 releasenotes.txt file from application directory, and the shortcut

+;; from the start menu.

+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

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

+Function un.DocumentsAndSettingsFolder

+

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

+Push $0

+Push $1

+Push $2

+

+  DetailPrint "Deleting files in Documents and Settings folder"

+

+  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

+

+        ; If uninstalling a normal install remove everything

+        ; Otherwise (preview/dmz etc) just remove cache

+    StrCmp $INSTFLAGS "" RM_ALL RM_CACHE

+      RM_ALL:

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

+        GoTo CONTINUE

+      RM_CACHE:

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

+        Delete "$2\Application Data\SecondLife\user_settings\settings_windlight.xml"

+

+  CONTINUE:

+    IntOp $0 $0 + 1

+    Goto LOOP

+  DONE:

+

+Pop $2

+Pop $1

+Pop $0

+

+; Delete 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 "$0\SecondLife"

+Pop $0

+

+; Delete filse 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 "Imprudence" ""

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

+          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

+

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

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

+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

+%%DELETE_FILES%%

+

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

+Delete "$INSTDIR\newview.map"

+Delete "$INSTDIR\SecondLife.pdb"

+Delete "$INSTDIR\SecondLife.map"

+Delete "$INSTDIR\comm.dat"

+Delete "$INSTDIR\*.glsl"

+Delete "$INSTDIR\motions\*.lla"

+Delete "$INSTDIR\trial\*.html"

+Delete "$INSTDIR\newview.exe"

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

+

+Delete "$INSTDIR\uninst.exe"

+RMDir "$INSTDIR"

+

+IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER

+

+FOLDERFOUND:

+  MessageBox MB_YESNO $(DeleteProgramFilesMB) IDNO NOFOLDER

+  RMDir /r "$INSTDIR"

+

+NOFOLDER:

+

+FunctionEnd

+

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

+;;; Uninstall settings

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

+UninstallText $(UninstallTextMsg)

+ShowUninstDetails show

+

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

+;;; Uninstall section

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

+Section Uninstall

+

+; Start with some default values.

+StrCpy $INSTFLAGS ""

+StrCpy $INSTPROG "${INSTNAME}"

+StrCpy $INSTEXE "${INSTEXE}"

+StrCpy $INSTSHORTCUT "${SHORTCUT}"

+Call un.CheckStartupParams              ; Figure out where, what and how to uninstall.

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

+DeleteRegKey HKEY_LOCAL_MACHINE "Software\Linden Research, Inc.\Installer Language" 

+

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

+

+SectionEnd                              ; end of uninstall section

+

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

+; (From the NSIS wiki, DK)

+; GetParameterValue

+;

+; Usage:

+; !insertmacro GetParameterValue "/L=" "1033"

+; pop $R0

+;

+; Returns on top of stack

+;

+; Example command lines:

+; foo.exe /S /L=1033 /D=C:\Program Files\Foo

+; or:

+; foo.exe /S "/L=1033" /D="C:\Program Files\Foo"

+; gpv "/L=" "1033"

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

+

+ !macro GetParameterValue SWITCH DEFAULT

+   Push $0

+   Push $1

+   Push $2

+   Push $3

+   Push $4

+

+ ;$CMDLINE='"My Setup\Setup.exe" /L=1033 /S'

+   Push "$CMDLINE"

+   Push '${SWITCH}"'

+   !insertmacro StrStr

+   Pop $0

+   StrCmp "$0" "" gpv_notquoted

+ ;$0='/L="1033" /S'

+   StrLen $2 "$0"

+   Strlen $1 "${SWITCH}"

+   IntOp $1 $1 + 1

+   StrCpy $0 "$0" $2 $1

+ ;$0='1033" /S'

+   Push "$0"

+   Push '"'

+   !insertmacro StrStr

+   Pop $1

+   StrLen $2 "$0"

+   StrLen $3 "$1"

+   IntOp $4 $2 - $3

+   StrCpy $0 $0 $4 0

+   Goto gpv_done

+

+   gpv_notquoted:

+   Push "$CMDLINE"

+   Push "${SWITCH}"

+   !insertmacro StrStr

+   Pop $0

+   StrCmp "$0" "" gpv_done

+ ;$0='/L="1033" /S'

+   StrLen $2 "$0"

+   Strlen $1 "${SWITCH}"

+   StrCpy $0 "$0" $2 $1

+ ;$0=1033 /S'

+   Push "$0"

+   Push ' '

+   !insertmacro StrStr

+   Pop $1

+   StrLen $2 "$0"

+   StrLen $3 "$1"

+   IntOp $4 $2 - $3

+   StrCpy $0 $0 $4 0

+   Goto gpv_done

+

+   gpv_done:

+   StrCmp "$0" "" 0 +2

+   StrCpy $0 "${DEFAULT}"

+

+   Pop $4

+   Pop $3

+   Pop $2

+   Pop $1

+   Exch $0

+ !macroend

+

+; And I had to modify StrStr a tiny bit.

+; Possible upgrade switch the goto's to use ${__LINE__}

+

+!macro STRSTR

+  Exch $R1 ; st=haystack,old$R1, $R1=needle

+  Exch    ; st=old$R1,haystack

+  Exch $R2 ; st=old$R1,old$R2, $R2=haystack

+  Push $R3

+  Push $R4

+  Push $R5

+  StrLen $R3 $R1

+  StrCpy $R4 0

+  ; $R1=needle

+  ; $R2=haystack

+  ; $R3=len(needle)

+  ; $R4=cnt

+  ; $R5=tmp

+ ;  loop;

+    StrCpy $R5 $R2 $R3 $R4

+    StrCmp $R5 $R1 +4

+    StrCmp $R5 "" +3

+    IntOp $R4 $R4 + 1

+    Goto -4

+ ;  done;

+  StrCpy $R1 $R2 "" $R4

+  Pop $R5

+  Pop $R4

+  Pop $R3

+  Pop $R2

+  Exch $R1

+!macroend

+

+Function GetProgramName

+  !insertmacro GetParameterValue "/P=" "Imprudence"

+FunctionEnd

+

+Function un.GetProgramName

+  !insertmacro GetParameterValue "/P=" "Imprudence"

+FunctionEnd

+

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

+; (From the NSIS documentation, JC)

+; GetWindowsVersion

+;

+; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/

+; Updated by Joost Verburg

+;

+; Returns on top of stack

+;

+; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003)

+; or

+; '' (Unknown Windows Version)

+;

+; Usage:

+;   Call GetWindowsVersion

+;   Pop $R0

+;   ; at this point $R0 is "NT 4.0" or whatnot

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

+Function GetWindowsVersion

+ 

+   Push $R0

+   Push $R1

+ 

+   ReadRegStr $R0 HKLM \

+   "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion

+

+   IfErrors 0 lbl_winnt

+   

+   ; we are not NT

+   ReadRegStr $R0 HKLM \

+   "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber

+ 

+   StrCpy $R1 $R0 1

+   StrCmp $R1 '4' 0 lbl_error

+ 

+   StrCpy $R1 $R0 3

+ 

+   StrCmp $R1 '4.0' lbl_win32_95

+   StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98

+ 

+   lbl_win32_95:

+     StrCpy $R0 '95'

+   Goto lbl_done

+ 

+   lbl_win32_98:

+     StrCpy $R0 '98'

+   Goto lbl_done

+ 

+   lbl_win32_ME:

+     StrCpy $R0 'ME'

+   Goto lbl_done

+ 

+   lbl_winnt:

+ 

+   StrCpy $R1 $R0 1

+ 

+   StrCmp $R1 '3' lbl_winnt_x

+   StrCmp $R1 '4' lbl_winnt_x

+ 

+   StrCpy $R1 $R0 3

+ 

+   StrCmp $R1 '5.0' lbl_winnt_2000

+   StrCmp $R1 '5.1' lbl_winnt_XP

+   StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error

+ 

+   lbl_winnt_x:

+     StrCpy $R0 "NT $R0" 6

+   Goto lbl_done

+ 

+   lbl_winnt_2000:

+     Strcpy $R0 '2000'

+   Goto lbl_done

+ 

+   lbl_winnt_XP:

+     Strcpy $R0 'XP'

+   Goto lbl_done

+ 

+   lbl_winnt_2003:

+     Strcpy $R0 '2003'

+   Goto lbl_done

+ 

+   lbl_error:

+     Strcpy $R0 ''

+   lbl_done:

+ 

+   Pop $R1

+   Exch $R0

+ 

+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

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

+Function .onInit

+

+        ; read the language from registry (ok if not there) and set langauge menu

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

+        StrCpy $LANGUAGE $0

+

+        Push ""

+        Push ${LANG_ENGLISH}

+        Push English

+        Push ${LANG_GERMAN}

+        Push German

+        Push ${LANG_JAPANESE}

+        Push Japanese

+        Push ${LANG_KOREAN}

+        Push Korean

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

+        LangDLL::LangDialog "Installer Language" "Please select the language of the installer"

+        Pop $LANGUAGE

+        StrCmp $LANGUAGE "cancel" 0 +2

+                Abort

+

+        ; save language in registry             

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

+FunctionEnd

+

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

+Function un.onInit

+

+        ; read language from registry and set for ininstaller

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

+        StrCpy $LANGUAGE $0

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; EOF  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

diff --git a/linden/indra/newview/installers/windows/lang_de.nsi b/linden/indra/newview/installers/windows/lang_de.nsi
index c410128..6be219e 100644
--- a/linden/indra/newview/installers/windows/lang_de.nsi
+++ b/linden/indra/newview/installers/windows/lang_de.nsi
@@ -1,57 +1,57 @@
-; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"
-
-; subtitle on license text caption (setup new version or update current one
-LangString LicenseSubTitleUpdate ${LANG_GERMAN} " Update"
-LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup"
-
-; description on license page
-LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte Second Life mit Version ${VERSION_LONG}. ersetzen."
-LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird Second Life auf Ihrem Computer installieren."
-LangString LicenseDescNext ${LANG_GERMAN} "Weiter"
-
-; installation directory text
-LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner"
-LangString DirectoryChooseUpdate ${LANG_GERMAN} "Wählen Sie den Second Life Ordner für dieses Update:"
-LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem Second Life installieren werden soll:"
-
-; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen."
-
-; installation success dialog
-LangString InstSuccesssQuestion ${LANG_GERMAN} "Second Life starten?"
-
-; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_GERMAN} "Überprüfe alte Version ..."
-
-; check windows version
-LangString CheckWindowsVersionDP ${LANG_GERMAN} "Überprüfung der Windows Version ..."
-LangString CheckWindowsVersionMB ${LANG_GERMAN} 'Second Life unterstützt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, könnte zu unvorhersehbaren Abstürzen und Datenverlust führen.$\n$\nTrotzdem installieren?'
-
-; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_GERMAN} "Überprüfung der Installations-Berechtigungen ..."
-LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Second Life installieren zu können.'
-
-; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_GERMAN} "Überprüfung der Entfernungs-Berechtigungen ..."
-LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Second Life entfernen zu können..'
-
-; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist Second Life ${VERSION_LONG} bereits installiert.$\n$\nWürden Sie es gerne erneut installieren?"
-
-; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Second Life ..."
-LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Second Life kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Second Life zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen."
-
-; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Second Life ..."
-LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Second Life kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Second Life zu beenden.$\nKlicken Sie CANCEL, um abzubrechen."
-
-; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_GERMAN} "Löschung aller Cache Dateien in Dokumente und Einstellungen."
-
-; delete program files
-LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem SecondLife Programm Ordner.$\n$\nDies sind möglicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nMöchten Sie diese ebenfalls löschen?"
-
-; uninstall text
-LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird Second Life ${VERSION_LONG} von Ihrem System entfernen."
+; First is default

+LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"

+

+; subtitle on license text caption (setup new version or update current one

+LangString LicenseSubTitleUpdate ${LANG_GERMAN} " Update"

+LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup"

+

+; description on license page

+LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte Imprudence mit Version ${VERSION_LONG}. ersetzen."

+LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird Imprudence auf Ihrem Computer installieren."

+LangString LicenseDescNext ${LANG_GERMAN} "Weiter"

+

+; installation directory text

+LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner"

+LangString DirectoryChooseUpdate ${LANG_GERMAN} "Wählen Sie den Imprudence Ordner für dieses Update:"

+LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem Imprudence installieren werden soll:"

+

+; CheckStartupParams message box

+LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen."

+

+; installation success dialog

+LangString InstSuccesssQuestion ${LANG_GERMAN} "Imprudence starten?"

+

+; remove old NSIS version

+LangString RemoveOldNSISVersion ${LANG_GERMAN} "Überprüfe alte Version ..."

+

+; check windows version

+LangString CheckWindowsVersionDP ${LANG_GERMAN} "Überprüfung der Windows Version ..."

+LangString CheckWindowsVersionMB ${LANG_GERMAN} 'Imprudence unterstützt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, könnte zu unvorhersehbaren Abstürzen und Datenverlust führen.$\n$\nTrotzdem installieren?'

+

+; checkifadministrator function (install)

+LangString CheckAdministratorInstDP ${LANG_GERMAN} "Überprüfung der Installations-Berechtigungen ..."

+LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Imprudence installieren zu können.'

+

+; checkifadministrator function (uninstall)

+LangString CheckAdministratorUnInstDP ${LANG_GERMAN} "Überprüfung der Entfernungs-Berechtigungen ..."

+LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Imprudence entfernen zu können..'

+

+; checkifalreadycurrent

+LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist Imprudence ${VERSION_LONG} bereits installiert.$\n$\nWürden Sie es gerne erneut installieren?"

+

+; closeimprudence function (install)

+LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..."

+LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Imprudence kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen."

+

+; closeimprudence function (uninstall)

+LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..."

+LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Imprudence kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um abzubrechen."

+

+; removecachefiles

+LangString RemoveCacheFilesDP ${LANG_GERMAN} "Löschung aller Cache Dateien in Dokumente und Einstellungen."

+

+; delete program files

+LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem Imprudence Programm Ordner.$\n$\nDies sind möglicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nMöchten Sie diese ebenfalls löschen?"

+

+; uninstall text

+LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird Imprudence ${VERSION_LONG} von Ihrem System entfernen."

diff --git a/linden/indra/newview/installers/windows/lang_en-us.nsi b/linden/indra/newview/installers/windows/lang_en-us.nsi
index 218f1c6..e203fb6 100644
--- a/linden/indra/newview/installers/windows/lang_en-us.nsi
+++ b/linden/indra/newview/installers/windows/lang_en-us.nsi
@@ -1,52 +1,52 @@
-; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
-
-; subtitle on license text caption
-LangString LicenseSubTitleUpdate ${LANG_ENGLISH} " Update"
-LangString LicenseSubTitleSetup ${LANG_ENGLISH} " Setup"
-
-; installation directory text
-LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory" 
-LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the Second Life directory to update to version ${VERSION_LONG}.(XXX):"
-LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install Second Life in:"
-
-; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed."
-
-; installation success dialog
-LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start Second Life now?"
-
-; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..."
-
-; check windows version
-LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..."
-LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'Second Life only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?'
-
-; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..."
-LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Second Life.'
-
-; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_ENGLISH} "Checking for permission to uninstall..."
-LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall Second Life.'
-
-; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that Second Life ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?"
-
-; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for Second Life to shut down..."
-LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "Second Life can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close Second Life and continue.$\nSelect CANCEL to cancel installation."
-
-; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for Second Life to shut down..."
-LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "Second Life can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close Second Life and continue.$\nSelect CANCEL to cancel."
-
-; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder"
-
-; delete program files
-LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your SecondLife program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?"
-
-; uninstall text
-LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall Second Life ${VERSION_LONG} from your system."
+; First is default

+LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"

+

+; subtitle on license text caption

+LangString LicenseSubTitleUpdate ${LANG_ENGLISH} " Update"

+LangString LicenseSubTitleSetup ${LANG_ENGLISH} " Setup"

+

+; installation directory text

+LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory" 

+LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the Imprudence directory to update to version ${VERSION_LONG}.(XXX):"

+LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install Imprudence in:"

+

+; CheckStartupParams message box

+LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed."

+

+; installation success dialog

+LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start Imprudence now?"

+

+; remove old NSIS version

+LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..."

+

+; check windows version

+LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..."

+LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'Imprudence only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?'

+

+; checkifadministrator function (install)

+LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..."

+LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Imprudence.'

+

+; checkifadministrator function (uninstall)

+LangString CheckAdministratorUnInstDP ${LANG_ENGLISH} "Checking for permission to uninstall..."

+LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall Imprudence.'

+

+; checkifalreadycurrent

+LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that Imprudence ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?"

+

+; closeimprudence function (install)

+LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..."

+LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "Imprudence can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel installation."

+

+; closeimprudence function (uninstall)

+LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..."

+LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "Imprudence can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel."

+

+; removecachefiles

+LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder"

+

+; delete program files

+LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your Imprudence program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?"

+

+; uninstall text

+LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall Imprudence ${VERSION_LONG} from your system."

diff --git a/linden/indra/newview/installers/windows/lang_ja.nsi b/linden/indra/newview/installers/windows/lang_ja.nsi
index 5e0496e..f59957a 100644
--- a/linden/indra/newview/installers/windows/lang_ja.nsi
+++ b/linden/indra/newview/installers/windows/lang_ja.nsi
@@ -1,57 +1,57 @@
-; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf"
-
-; subtitle on license text caption
-LangString LicenseSubTitleUpdate ${LANG_JAPANESE} " ƒAƒbƒvƒf�[ƒg" 
-LangString LicenseSubTitleSetup ${LANG_JAPANESE} " ƒZƒbƒgƒAƒbƒv" 
-
-; description on license page
-LangString LicenseDescUpdate ${LANG_JAPANESE} "‚±‚̃pƒbƒP�[ƒW‚̓ZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒo�[ƒWƒ‡ƒ“${VERSION_LONG}.‚ɃAƒbƒvƒf�[ƒg‚µ‚Ü‚·�B" 
-LangString LicenseDescSetup ${LANG_JAPANESE} "‚±‚̃pƒbƒP�[ƒW‚Í‚ ‚È‚½‚̃Rƒ“ƒsƒ…�[ƒ^‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·�B" 
-LangString LicenseDescNext ${LANG_JAPANESE} "ŽŸ" 
-
-; installation directory text
-LangString DirectoryChooseTitle ${LANG_JAPANESE} "ƒCƒ“ƒXƒg�[ƒ‹�EƒfƒBƒŒƒNƒgƒŠ" 
-LangString DirectoryChooseUpdate ${LANG_JAPANESE} "ƒAƒbƒvƒf�[ƒg‚·‚éƒZƒJƒ“ƒhƒ‰ƒCƒt‚̃fƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B:" 
-LangString DirectoryChooseSetup ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚éƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B: " 
-
-; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_JAPANESE} "ƒvƒ�ƒOƒ‰ƒ€–¼'$INSTPROG'‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ�BƒTƒCƒŒƒ“ƒg�EƒAƒbƒvƒf�[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B" 
-
-; installation success dialog
-LangString InstSuccesssQuestion ${LANG_JAPANESE} "’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ðŠJŽn‚µ‚Ü‚·‚©�H " 
-
-; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_JAPANESE} "ŒÃ‚¢ƒo�[ƒWƒ‡ƒ“�î•ñ‚ðƒ`ƒFƒbƒN’†‚Å‚·�c" 
-
-; check windows version
-LangString CheckWindowsVersionDP ${LANG_JAPANESE} "ƒEƒBƒ“ƒhƒEƒY‚̃o�[ƒWƒ‡ƒ“�î•ñ‚ðƒ`ƒFƒbƒN’†‚Å‚·..." 
-LangString CheckWindowsVersionMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ÍWindows XP�AWindows 2000�AMac OS X‚Ì‚Ý‚ðƒTƒ|�[ƒg‚µ‚Ä‚¢‚Ü‚·�BWindows $R0‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚鎖‚Í�Aƒf�[ƒ^‚Ì�ÁŽ¸‚âƒNƒ‰ƒbƒVƒ…‚ÌŒ´ˆö‚É‚È‚é‰Â”\�«‚ª‚ ‚è‚Ü‚·�BƒCƒ“ƒXƒg�[ƒ‹‚𑱂¯‚Ü‚·‚©�H" 
-
-; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_JAPANESE} "ƒCƒ“ƒXƒg�[ƒ‹‚Ì‚½‚ß‚ÌŒ ŒÀ‚ðƒ`ƒFƒbƒN’†‚Å‚·..." 
-LangString CheckAdministratorInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚ÍŠÇ—�ŽÒŒ ŒÀ‚ª•K—v‚Å‚·�B"
-
-; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_JAPANESE} "ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚Ì‚½‚ß‚ÌŒ ŒÀ‚ðƒ`ƒFƒbƒN’†‚Å‚·..." 
-LangString CheckAdministratorUnInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚ÍŠÇ—�ŽÒŒ ŒÀ‚ª•K—v‚Å‚·�B" 
-
-; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt${VERSION_LONG} ‚̓Cƒ“ƒXƒg�[ƒ‹�Ï‚Ý‚Å‚·�B�Ä“xƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·‚©�H " 
-
-; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹’†‚Å‚·..." 
-LangString CloseSecondLifeInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚Ì‹N“®’†‚ɃCƒ“ƒXƒg�[ƒ‹‚Í�o—ˆ‚Ü‚¹‚ñ�B’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹‚µ‚ăCƒ“ƒXƒg�[ƒ‹‚ðŠJŽn‚·‚é�ê�‡‚ÍOKƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢�BCANCEL‚ð‰Ÿ‚·‚Æ’†Ž~‚µ‚Ü‚·�B"
-
-; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹’†‚Å‚·..." 
-LangString CloseSecondLifeUnInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚Ì‹N“®’†‚ɃAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚Í�o—ˆ‚Ü‚¹‚ñ�B’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹‚µ‚ăAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚ðŠJŽn‚·‚é�ê�‡‚ÍOKƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢�BCANCEL‚ð‰Ÿ‚·‚Æ’†Ž~‚µ‚Ü‚·�B" 
-
-; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_JAPANESE} " Documents and Settings ƒtƒHƒ‹ƒ_‚̃LƒƒƒbƒVƒ…ƒtƒ@ƒCƒ‹‚ðƒfƒŠ�[ƒg’†‚Å‚·�B" 
-
-; delete program files
-LangString DeleteProgramFilesMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚̃fƒBƒŒƒNƒgƒŠ‚É‚Í�A‚Ü‚¾ƒtƒ@ƒCƒ‹‚ªŽc‚³‚ê‚Ä‚¢‚Ü‚·�B$\n$INSTDIR$\n‚É‚ ‚È‚½‚ª�ì�¬�A‚Ü‚½‚͈ړ®‚³‚¹‚½ƒtƒ@ƒCƒ‹‚ª‚ ‚é‰Â”\�«‚ª‚ ‚è‚Ü‚·�B‘S‚Ä�í�œ‚µ‚Ü‚·‚©�H " 
-
-; uninstall text
-LangString UninstallTextMsg ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt${VERSION_LONG}‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·�B"
+; First is default

+LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf"

+

+; subtitle on license text caption

+LangString LicenseSubTitleUpdate ${LANG_JAPANESE} " ƒAƒbƒvƒf�[ƒg" 

+LangString LicenseSubTitleSetup ${LANG_JAPANESE} " ƒZƒbƒgƒAƒbƒv" 

+

+; description on license page

+LangString LicenseDescUpdate ${LANG_JAPANESE} "‚±‚̃pƒbƒP�[ƒW‚̓ZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒo�[ƒWƒ‡ƒ“${VERSION_LONG}.‚ɃAƒbƒvƒf�[ƒg‚µ‚Ü‚·�B" 

+LangString LicenseDescSetup ${LANG_JAPANESE} "‚±‚̃pƒbƒP�[ƒW‚Í‚ ‚È‚½‚̃Rƒ“ƒsƒ…�[ƒ^‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·�B" 

+LangString LicenseDescNext ${LANG_JAPANESE} "ŽŸ" 

+

+; installation directory text

+LangString DirectoryChooseTitle ${LANG_JAPANESE} "ƒCƒ“ƒXƒg�[ƒ‹�EƒfƒBƒŒƒNƒgƒŠ" 

+LangString DirectoryChooseUpdate ${LANG_JAPANESE} "ƒAƒbƒvƒf�[ƒg‚·‚éƒZƒJƒ“ƒhƒ‰ƒCƒt‚̃fƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B:" 

+LangString DirectoryChooseSetup ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚éƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B: " 

+

+; CheckStartupParams message box

+LangString CheckStartupParamsMB ${LANG_JAPANESE} "ƒvƒ�ƒOƒ‰ƒ€–¼'$INSTPROG'‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ�BƒTƒCƒŒƒ“ƒg�EƒAƒbƒvƒf�[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B" 

+

+; installation success dialog

+LangString InstSuccesssQuestion ${LANG_JAPANESE} "’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ðŠJŽn‚µ‚Ü‚·‚©�H " 

+

+; remove old NSIS version

+LangString RemoveOldNSISVersion ${LANG_JAPANESE} "ŒÃ‚¢ƒo�[ƒWƒ‡ƒ“�î•ñ‚ðƒ`ƒFƒbƒN’†‚Å‚·�c" 

+

+; check windows version

+LangString CheckWindowsVersionDP ${LANG_JAPANESE} "ƒEƒBƒ“ƒhƒEƒY‚̃o�[ƒWƒ‡ƒ“�î•ñ‚ðƒ`ƒFƒbƒN’†‚Å‚·..." 

+LangString CheckWindowsVersionMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ÍWindows XP�AWindows 2000�AMac OS X‚Ì‚Ý‚ðƒTƒ|�[ƒg‚µ‚Ä‚¢‚Ü‚·�BWindows $R0‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚鎖‚Í�Aƒf�[ƒ^‚Ì�ÁŽ¸‚âƒNƒ‰ƒbƒVƒ…‚ÌŒ´ˆö‚É‚È‚é‰Â”\�«‚ª‚ ‚è‚Ü‚·�BƒCƒ“ƒXƒg�[ƒ‹‚𑱂¯‚Ü‚·‚©�H" 

+

+; checkifadministrator function (install)

+LangString CheckAdministratorInstDP ${LANG_JAPANESE} "ƒCƒ“ƒXƒg�[ƒ‹‚Ì‚½‚ß‚ÌŒ ŒÀ‚ðƒ`ƒFƒbƒN’†‚Å‚·..." 

+LangString CheckAdministratorInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚ÍŠÇ—�ŽÒŒ ŒÀ‚ª•K—v‚Å‚·�B"

+

+; checkifadministrator function (uninstall)

+LangString CheckAdministratorUnInstDP ${LANG_JAPANESE} "ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚Ì‚½‚ß‚ÌŒ ŒÀ‚ðƒ`ƒFƒbƒN’†‚Å‚·..." 

+LangString CheckAdministratorUnInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚ÍŠÇ—�ŽÒŒ ŒÀ‚ª•K—v‚Å‚·�B" 

+

+; checkifalreadycurrent

+LangString CheckIfCurrentMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt${VERSION_LONG} ‚̓Cƒ“ƒXƒg�[ƒ‹�Ï‚Ý‚Å‚·�B�Ä“xƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·‚©�H " 

+

+; closeimprudence function (install)

+LangString CloseSecondLifeInstDP ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹’†‚Å‚·..." 

+LangString CloseSecondLifeInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚Ì‹N“®’†‚ɃCƒ“ƒXƒg�[ƒ‹‚Í�o—ˆ‚Ü‚¹‚ñ�B’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹‚µ‚ăCƒ“ƒXƒg�[ƒ‹‚ðŠJŽn‚·‚é�ê�‡‚ÍOKƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢�BCANCEL‚ð‰Ÿ‚·‚Æ’†Ž~‚µ‚Ü‚·�B"

+

+; closeimprudence function (uninstall)

+LangString CloseSecondLifeUnInstDP ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹’†‚Å‚·..." 

+LangString CloseSecondLifeUnInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚Ì‹N“®’†‚ɃAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚Í�o—ˆ‚Ü‚¹‚ñ�B’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹‚µ‚ăAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚ðŠJŽn‚·‚é�ê�‡‚ÍOKƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢�BCANCEL‚ð‰Ÿ‚·‚Æ’†Ž~‚µ‚Ü‚·�B" 

+

+; removecachefiles

+LangString RemoveCacheFilesDP ${LANG_JAPANESE} " Documents and Settings ƒtƒHƒ‹ƒ_‚̃LƒƒƒbƒVƒ…ƒtƒ@ƒCƒ‹‚ðƒfƒŠ�[ƒg’†‚Å‚·�B" 

+

+; delete program files

+LangString DeleteProgramFilesMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚̃fƒBƒŒƒNƒgƒŠ‚É‚Í�A‚Ü‚¾ƒtƒ@ƒCƒ‹‚ªŽc‚³‚ê‚Ä‚¢‚Ü‚·�B$\n$INSTDIR$\n‚É‚ ‚È‚½‚ª�ì�¬�A‚Ü‚½‚͈ړ®‚³‚¹‚½ƒtƒ@ƒCƒ‹‚ª‚ ‚é‰Â”\�«‚ª‚ ‚è‚Ü‚·�B‘S‚Ä�í�œ‚µ‚Ü‚·‚©�H " 

+

+; uninstall text

+LangString UninstallTextMsg ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt${VERSION_LONG}‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·�B"

diff --git a/linden/indra/newview/installers/windows/lang_ko.nsi b/linden/indra/newview/installers/windows/lang_ko.nsi
index b570315..2530e4b 100644
--- a/linden/indra/newview/installers/windows/lang_ko.nsi
+++ b/linden/indra/newview/installers/windows/lang_ko.nsi
@@ -1,57 +1,57 @@
-; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\Korean.nlf"
-
-; subtitle on license text caption
-LangString LicenseSubTitleUpdate ${LANG_KOREAN} "¾÷µ¥ÀÌÆ®"
-LangString LicenseSubTitleSetup ${LANG_KOREAN} " ¼³Ä¡Çϱâ"
-
-; description on license page
-LangString LicenseDescUpdate ${LANG_KOREAN} "ÀÌ ÆÑÅ°Áö´Â ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¹öÀü${VERSION_LONG}.À¸·Î ¾÷µ¥ÀÌÆ® ÇÕ´Ï´Ù. "
-LangString LicenseDescSetup ${LANG_KOREAN} "ÀÌ ÆÑÅ°Áö´Â ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ÄÄÇ»ÅÍ¿¡ ¼³Ä¡ÇÕ´Ï´Ù."
-LangString LicenseDescNext ${LANG_KOREAN} "´ÙÀ½"
-
-; installation directory text
-LangString DirectoryChooseTitle ${LANG_KOREAN} "¼³Ä¡ µð·ºÅ丮"
-LangString DirectoryChooseUpdate ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¾÷µ¥ÀÌÆ®ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä. "
-LangString DirectoryChooseSetup ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¼³Ä¡ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:"
-
-; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_KOREAN} " ¡®$INSTPROG¡¯ ÇÁ·Î±×·¥À» ãÁö ¸øÇß½À´Ï´Ù. ÀÚµ¿ ¾÷µ¥ÀÌÆ®¿¡ ½ÇÆÐÇß½À´Ï´Ù."
-
-; installation success dialog
-LangString InstSuccesssQuestion ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ½ÃÀÛÇÏ°Ú½À´Ï±î?"
-
-; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_KOREAN} "ÀÌÀü ¹öÀüÀ» ã°í ÀÖ½À´Ï´Ù¡¦ "
-
-; check windows version
-LangString CheckWindowsVersionDP ${LANG_KOREAN} "À©µµ¿ì ¹öÀüÀ» È®ÀÎÇÏ°í ÀÖ½À´Ï´Ù."
-LangString CheckWindowsVersionMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ´Â À©µµ¿ì XP, À©µµ¿ì 2000, ±×¸®°í ¸Æ OS X¸¦ Áö¿øÇÕ´Ï´Ù. À©µµ¿ì $R0¿¡ ¼³Ä¡¸¦ ½ÃµµÇÏ¸é ¿ÀÀÛµ¿°ú µ¥ÀÌÅÍ ºÐ½ÇÀÌ ÀϾ ¼ö ÀÖ½À´Ï´Ù. °è¼Ó ¼³Ä¡ÇÏ°Ú½À´Ï±î? "
-
-; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_KOREAN} "¼³Ä¡ ±ÇÇÑÀ» È®ÀÎ ÁßÀÔ´Ï´Ù... "
-LangString CheckAdministratorInstMB ${LANG_KOREAN} "ÇöÀç ¡®¼Õ´Ô¡¯°èÁ¤À» »ç¿ë ÁßÀÔ´Ï´Ù. ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¼³Ä¡Çϱâ À§Çؼ± ¡®¿î¿µÀÚ¡± °èÁ¤À» »ç¿ëÇØ¾ß ÇÕ´Ï´Ù."
-
-; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_KOREAN} "Á¦°Å ±ÇÇÑÀ» È®ÀÎ ÁßÀÔ´Ï´Ù. "
-LangString CheckAdministratorUnInstMB ${LANG_KOREAN} " ÇöÀç ¡®¼Õ´Ô¡¯°èÁ¤À» »ç¿ë ÁßÀÔ´Ï´Ù. ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¦°ÅÇϱâ À§Çؼ± ¡®¿î¿µÀÚ¡± °èÁ¤À» »ç¿ëÇØ¾ß ÇÕ´Ï´Ù. "
-
-; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ ¹öÀü ${VERSION_LONG}ÀÌ ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù. ´Ù½Ã ¼³Ä¡ÇϽðڽÀ´Ï±î? "
-
-; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÒ ¶§ ±îÁö ´ë±â Áß¡¦ "
-LangString CloseSecondLifeInstMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ°¡ ÀÌ¹Ì ÀÛµ¿ ÁßÀÏ °æ¿ì ¼³Ä¡¸¦ °è¼Ó ÇÒ ¼ö ¾ø½À´Ï´Ù. ÇöÀç ÀÛ¾÷À» ¸ØÃß°í ¡®È®ÀΡ¯À» ´­·¯ ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÑ ´ÙÀ½ ÁøÇàÇϱ⠹ٶø´Ï´Ù. ¼³Ä¡¸¦ Ãë¼ÒÇÏ·Á¸é ¡®Ãë¼Ò¡¯¸¦ ´©¸£¼¼¿ä." 
-
-; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÒ ¶§ ±îÁö ´ë±â Áß¡¦¡±"
-LangString CloseSecondLifeUnInstMB ${LANG_KOREAN} " ¼¼ÄÁµå¶óÀÌÇÁ°¡ ÀÌ¹Ì ÀÛµ¿ ÁßÀÏ °æ¿ì Á¦°Å¸¦ °è¼Ó ÇÒ ¼ö ¾ø½À´Ï´Ù. ÇöÀç ÀÛ¾÷À» ¸ØÃß°í ¡®È®ÀΡ¯À» ´­·¯ ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÑ ´ÙÀ½ ÁøÇàÇϱ⠹ٶø´Ï´Ù. ¼³Ä¡¸¦ ÃëÇÏ·Á¸é ¡®Ãë¼Ò¡¯¸¦ ´©¸£¼¼¿ä. "
-
-; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_KOREAN} " Documents and Settings Æú´õ ³»ÀÇ Ä³½Ã ÆÄÀϵéÀ» Áö¿ó´Ï´Ù."
-
-; delete program files
-LangString DeleteProgramFilesMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ ÇÁ·Î±×·¥ µð·ºÅ丮¿¡ ¾ÆÁ÷ ÆÄÀϵéÀÌ ³²¾Æ ÀÖ½À´Ï´Ù. ÀÌ ÆÄÀϵéÀº »ç¿ëÀÚ°¡ ¸¸µç °ÍµéÀ̰ųª$\n$INSTDIR$\n$\n·Î À̵¿ÇÑ ÆÄÀϵéÀÏ ¼ö ÀÖ½À´Ï´Ù. ÀÌ ÆÄÀϵéÀ» Á¦°ÅÇÏ°Ú½À´Ï±î?" 
-
-; uninstall text
-LangString UninstallTextMsg ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ${VERSION_LONG}À» ½Ã½ºÅÛ¿¡¼­ Á¦°ÅÇÕ´Ï´Ù."
+; First is default

+LoadLanguageFile "${NSISDIR}\Contrib\Language files\Korean.nlf"

+

+; subtitle on license text caption

+LangString LicenseSubTitleUpdate ${LANG_KOREAN} "¾÷µ¥ÀÌÆ®"

+LangString LicenseSubTitleSetup ${LANG_KOREAN} " ¼³Ä¡Çϱâ"

+

+; description on license page

+LangString LicenseDescUpdate ${LANG_KOREAN} "ÀÌ ÆÑÅ°Áö´Â ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¹öÀü${VERSION_LONG}.À¸·Î ¾÷µ¥ÀÌÆ® ÇÕ´Ï´Ù. "

+LangString LicenseDescSetup ${LANG_KOREAN} "ÀÌ ÆÑÅ°Áö´Â ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ÄÄÇ»ÅÍ¿¡ ¼³Ä¡ÇÕ´Ï´Ù."

+LangString LicenseDescNext ${LANG_KOREAN} "´ÙÀ½"

+

+; installation directory text

+LangString DirectoryChooseTitle ${LANG_KOREAN} "¼³Ä¡ µð·ºÅ丮"

+LangString DirectoryChooseUpdate ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¾÷µ¥ÀÌÆ®ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä. "

+LangString DirectoryChooseSetup ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¼³Ä¡ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:"

+

+; CheckStartupParams message box

+LangString CheckStartupParamsMB ${LANG_KOREAN} " ¡®$INSTPROG¡¯ ÇÁ·Î±×·¥À» ãÁö ¸øÇß½À´Ï´Ù. ÀÚµ¿ ¾÷µ¥ÀÌÆ®¿¡ ½ÇÆÐÇß½À´Ï´Ù."

+

+; installation success dialog

+LangString InstSuccesssQuestion ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ½ÃÀÛÇÏ°Ú½À´Ï±î?"

+

+; remove old NSIS version

+LangString RemoveOldNSISVersion ${LANG_KOREAN} "ÀÌÀü ¹öÀüÀ» ã°í ÀÖ½À´Ï´Ù¡¦ "

+

+; check windows version

+LangString CheckWindowsVersionDP ${LANG_KOREAN} "À©µµ¿ì ¹öÀüÀ» È®ÀÎÇÏ°í ÀÖ½À´Ï´Ù."

+LangString CheckWindowsVersionMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ´Â À©µµ¿ì XP, À©µµ¿ì 2000, ±×¸®°í ¸Æ OS X¸¦ Áö¿øÇÕ´Ï´Ù. À©µµ¿ì $R0¿¡ ¼³Ä¡¸¦ ½ÃµµÇÏ¸é ¿ÀÀÛµ¿°ú µ¥ÀÌÅÍ ºÐ½ÇÀÌ ÀϾ ¼ö ÀÖ½À´Ï´Ù. °è¼Ó ¼³Ä¡ÇÏ°Ú½À´Ï±î? "

+

+; checkifadministrator function (install)

+LangString CheckAdministratorInstDP ${LANG_KOREAN} "¼³Ä¡ ±ÇÇÑÀ» È®ÀÎ ÁßÀÔ´Ï´Ù... "

+LangString CheckAdministratorInstMB ${LANG_KOREAN} "ÇöÀç ¡®¼Õ´Ô¡¯°èÁ¤À» »ç¿ë ÁßÀÔ´Ï´Ù. ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¼³Ä¡Çϱâ À§Çؼ± ¡®¿î¿µÀÚ¡± °èÁ¤À» »ç¿ëÇØ¾ß ÇÕ´Ï´Ù."

+

+; checkifadministrator function (uninstall)

+LangString CheckAdministratorUnInstDP ${LANG_KOREAN} "Á¦°Å ±ÇÇÑÀ» È®ÀÎ ÁßÀÔ´Ï´Ù. "

+LangString CheckAdministratorUnInstMB ${LANG_KOREAN} " ÇöÀç ¡®¼Õ´Ô¡¯°èÁ¤À» »ç¿ë ÁßÀÔ´Ï´Ù. ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¦°ÅÇϱâ À§Çؼ± ¡®¿î¿µÀÚ¡± °èÁ¤À» »ç¿ëÇØ¾ß ÇÕ´Ï´Ù. "

+

+; checkifalreadycurrent

+LangString CheckIfCurrentMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ ¹öÀü ${VERSION_LONG}ÀÌ ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù. ´Ù½Ã ¼³Ä¡ÇϽðڽÀ´Ï±î? "

+

+; closeimprudence function (install)

+LangString CloseSecondLifeInstDP ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÒ ¶§ ±îÁö ´ë±â Áß¡¦ "

+LangString CloseSecondLifeInstMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ°¡ ÀÌ¹Ì ÀÛµ¿ ÁßÀÏ °æ¿ì ¼³Ä¡¸¦ °è¼Ó ÇÒ ¼ö ¾ø½À´Ï´Ù. ÇöÀç ÀÛ¾÷À» ¸ØÃß°í ¡®È®ÀΡ¯À» ´­·¯ ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÑ ´ÙÀ½ ÁøÇàÇϱ⠹ٶø´Ï´Ù. ¼³Ä¡¸¦ Ãë¼ÒÇÏ·Á¸é ¡®Ãë¼Ò¡¯¸¦ ´©¸£¼¼¿ä." 

+

+; closeimprudence function (uninstall)

+LangString CloseSecondLifeUnInstDP ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÒ ¶§ ±îÁö ´ë±â Áß¡¦¡±"

+LangString CloseSecondLifeUnInstMB ${LANG_KOREAN} " ¼¼ÄÁµå¶óÀÌÇÁ°¡ ÀÌ¹Ì ÀÛµ¿ ÁßÀÏ °æ¿ì Á¦°Å¸¦ °è¼Ó ÇÒ ¼ö ¾ø½À´Ï´Ù. ÇöÀç ÀÛ¾÷À» ¸ØÃß°í ¡®È®ÀΡ¯À» ´­·¯ ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÑ ´ÙÀ½ ÁøÇàÇϱ⠹ٶø´Ï´Ù. ¼³Ä¡¸¦ ÃëÇÏ·Á¸é ¡®Ãë¼Ò¡¯¸¦ ´©¸£¼¼¿ä. "

+

+; removecachefiles

+LangString RemoveCacheFilesDP ${LANG_KOREAN} " Documents and Settings Æú´õ ³»ÀÇ Ä³½Ã ÆÄÀϵéÀ» Áö¿ó´Ï´Ù."

+

+; delete program files

+LangString DeleteProgramFilesMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ ÇÁ·Î±×·¥ µð·ºÅ丮¿¡ ¾ÆÁ÷ ÆÄÀϵéÀÌ ³²¾Æ ÀÖ½À´Ï´Ù. ÀÌ ÆÄÀϵéÀº »ç¿ëÀÚ°¡ ¸¸µç °ÍµéÀ̰ųª$\n$INSTDIR$\n$\n·Î À̵¿ÇÑ ÆÄÀϵéÀÏ ¼ö ÀÖ½À´Ï´Ù. ÀÌ ÆÄÀϵéÀ» Á¦°ÅÇÏ°Ú½À´Ï±î?" 

+

+; uninstall text

+LangString UninstallTextMsg ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ${VERSION_LONG}À» ½Ã½ºÅÛ¿¡¼­ Á¦°ÅÇÕ´Ï´Ù."

diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
index a39bb9f..2082405 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -1,288 +1,288 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#ifdef IDC_STATIC
-#undef IDC_STATIC
-#endif
-#define IDC_STATIC (-1)
-#include "winresrc.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-// Commented out because it only compiles if you have MFC installed.
-//#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_LL_ICON             ICON                    "ll_icon.ico"
-IDI_INSTALL_ICON        ICON                    "install_icon.ico"
-IDI_LCD_LL_ICON         ICON                    "icon1.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-CONNECTBOX DIALOGEX 32, 32, 187, 246
-STYLE DS_SETFONT | DS_SETFOREGROUND | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    CONTROL         149,IDC_STATIC,"Static",SS_BITMAP,0,0,187,246
-    EDITTEXT        IDC_EDIT_FIRSTNAME,9,180,80,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_LASTNAME,98,180,80,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_PASSWORD,9,210,80,13,ES_PASSWORD |
-                    ES_AUTOHSCROLL
-    CONTROL         "Remember password",IDC_REMEMBER_PASSWORD,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,9,229,80,10
-    DEFPUSHBUTTON   "Connect...",IDOK,98,210,80,13
-    CONTROL         "Full screen",IDC_FULL_SCREEN,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,100,229,50,10
-    COMBOBOX        IDC_COMBO_SERVER,98,6,84,30,CBS_DROPDOWNLIST | CBS_SORT |
-                    WS_VSCROLL | WS_TABSTOP
-END
-
-CONNECTBOXIP DIALOG  32, 32, 282, 174
-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP |
-    WS_VISIBLE
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "First name:",IDC_STATIC_FIRSTNAME,152,24,36,10,NOT
-                    WS_GROUP
-    EDITTEXT        IDC_EDIT_FIRSTNAME,152,37,58,13,ES_AUTOHSCROLL
-    LTEXT           "Last name:",IDC_STATIC_LASTNAME,218,24,38,10,NOT
-                    WS_GROUP
-    EDITTEXT        IDC_EDIT_LASTNAME,218,37,57,13,ES_AUTOHSCROLL
-    LTEXT           "Password:",IDC_STATIC_PASSWORD,152,55,38,10
-    EDITTEXT        IDC_EDIT_PASSWORD,152,71,123,13,ES_PASSWORD |
-                    ES_AUTOHSCROLL
-    CONTROL         "Remember password for next time",IDC_REMEMBER_PASSWORD,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,84,123,10
-    LTEXT           "Return to:",IDC_STATIC,152,97,32,8
-    CONTROL         "Last location",IDC_RADIO_LAST,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,152,109,56,10
-    CONTROL         "Home",IDC_RADIO_HOME,"Button",BS_AUTORADIOBUTTON |
-                    WS_TABSTOP,218,109,35,10
-    LTEXT           "Server:",IDC_STATIC_SERVER,152,119,38,10,NOT WS_GROUP
-    COMBOBOX        IDC_COMBO_SERVER,152,134,88,43,CBS_DROPDOWN | WS_VSCROLL |
-                    WS_TABSTOP
-    PUSHBUTTON      "Quit",IDCANCEL,152,152,50,14
-    DEFPUSHBUTTON   "Connect...",IDOK,225,152,50,14
-    CONTROL         140,IDB_BITMAP1,"Static",SS_BITMAP,8,7,133,157
-    LTEXT           "Connect to Second Life",IDC_STATIC,152,7,78,8
-END
-
-SPLASHSCREEN DIALOG  32, 32, 144, 34
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
-FONT 8, "MS Sans Serif"
-BEGIN
-    ICON            IDI_LL_ICON,IDC_STATIC,7,7,20,20
-    LTEXT           "Loading Second Life...",666,36,13,91,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-    "CONNECTBOX", DIALOG
-    BEGIN
-        LEFTMARGIN, 8
-        RIGHTMARGIN, 180
-        VERTGUIDE, 152
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 239
-        HORZGUIDE, 44
-        HORZGUIDE, 57
-        HORZGUIDE, 123
-    END
-
-    "CONNECTBOXIP", DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 275
-        VERTGUIDE, 152
-        VERTGUIDE, 218
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 166
-        HORZGUIDE, 12
-        HORZGUIDE, 17
-        HORZGUIDE, 24
-        HORZGUIDE, 50
-        HORZGUIDE, 55
-        HORZGUIDE, 84
-        HORZGUIDE, 105
-        HORZGUIDE, 119
-    END
-
-    "SPLASHSCREEN", DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 137
-        VERTGUIDE, 36
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 27
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_MENU1 MENU
-BEGIN
-    POPUP "testmenu"
-    BEGIN
-        MENUITEM "test",                        ID_TESTMENU_TEST
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Cursor
-//
-
-TOOLGRAB                CURSOR                  "lltoolgrab.cur"
-TOOLLAND                CURSOR                  "lltoolland.cur"
-TOOLZOOMIN              CURSOR                  "lltoolzoomin.cur"
-TOOLCREATE              CURSOR                  "lltoolcreate.cur"
-ARROWDRAG               CURSOR                  "llarrowdrag.cur"
-ARROW                   CURSOR                  "llarrow.cur"
-NOLOCKED                CURSOR                  "llnolocked.cur"
-ARROWLOCKED             CURSOR                  "llarrowlocked.cur"
-GRABLOCKED              CURSOR                  "llgrablocked.cur"
-TOOLROTATE              CURSOR                  "lltoolrotate.cur"
-TOOLTRANSLATE           CURSOR                  "lltooltranslate.cur"
-TOOLSCALE               CURSOR                  "lltoolscale.cur"
-TOOLCAMERA              CURSOR                  "lltoolcamera.cur"
-TOOLPAN                 CURSOR                  "lltoolpan.cur"
-TOOLFOCUS               CURSOR                  "lltoolfocus.cur"
-TOOLPICKOBJECT3         CURSOR                  "toolpickobject3.cur"
-ARROWCOPY               CURSOR                  "arrowcop.cur"
-ARROWDRAGMULTI          CURSOR                  "llarrowdragmulti.cur"
-ARROWCOPYMULTI          CURSOR                  "arrowcopmulti.cur"
-TOOLSIT                 CURSOR                  "toolsit.cur"
-TOOLBUY                 CURSOR                  "toolbuy.cur"
-TOOLPAY                 CURSOR                  "toolpay.cur"
-TOOLOPEN                CURSOR                  "toolopen.cur"
-TOOLPIPETTE             CURSOR                  "toolpipette.cur"
-TOOLPLAY                CURSOR                  "toolplay.cur"
-TOOLPAUSE               CURSOR                  "toolpause.cur"
-TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,20,9,87416
- PRODUCTVERSION 1,20,9,87416
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Linden Lab"
-            VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.20.9.87416"
-            VALUE "InternalName", "Second Life"
-            VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
-            VALUE "OriginalFilename", "SecondLife.exe"
-            VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.20.9.87416"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BITMAP2             BITMAP                  "bitmap2.bmp"
-IDB_LOGIN               BITMAP                  "loginbackground.bmp"
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource.h"

+

+#ifdef IDC_STATIC

+#undef IDC_STATIC

+#endif

+#define IDC_STATIC (-1)

+#include "winresrc.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+// Commented out because it only compiles if you have MFC installed.

+//#include "winres.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE

+BEGIN

+    "resource.h\0"

+END

+

+2 TEXTINCLUDE

+BEGIN

+    "#include ""winres.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE

+BEGIN

+    "\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDI_LL_ICON             ICON                    "ll_icon.ico"

+IDI_INSTALL_ICON        ICON                    "install_icon.ico"

+IDI_LCD_LL_ICON         ICON                    "icon1.ico"

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Dialog

+//

+

+CONNECTBOX DIALOGEX 32, 32, 187, 246

+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |

+    WS_VISIBLE | WS_CAPTION | WS_SYSMENU

+FONT 8, "MS Sans Serif", 0, 0, 0x0

+BEGIN

+    CONTROL         149,IDC_STATIC,"Static",SS_BITMAP,0,0,187,246

+    EDITTEXT        IDC_EDIT_FIRSTNAME,9,180,80,13,ES_AUTOHSCROLL

+    EDITTEXT        IDC_EDIT_LASTNAME,98,180,80,13,ES_AUTOHSCROLL

+    EDITTEXT        IDC_EDIT_PASSWORD,9,210,80,13,ES_PASSWORD |

+                    ES_AUTOHSCROLL

+    CONTROL         "Remember password",IDC_REMEMBER_PASSWORD,"Button",

+                    BS_AUTOCHECKBOX | WS_TABSTOP,9,229,80,10

+    DEFPUSHBUTTON   "Connect...",IDOK,98,210,80,13

+    CONTROL         "Full screen",IDC_FULL_SCREEN,"Button",BS_AUTOCHECKBOX |

+                    WS_TABSTOP,100,229,50,10

+    COMBOBOX        IDC_COMBO_SERVER,98,6,84,30,CBS_DROPDOWNLIST | CBS_SORT |

+                    WS_VSCROLL | WS_TABSTOP

+END

+

+CONNECTBOXIP DIALOG  32, 32, 282, 174

+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP |

+    WS_VISIBLE

+FONT 8, "MS Sans Serif"

+BEGIN

+    LTEXT           "First name:",IDC_STATIC_FIRSTNAME,152,24,36,10,NOT

+                    WS_GROUP

+    EDITTEXT        IDC_EDIT_FIRSTNAME,152,37,58,13,ES_AUTOHSCROLL

+    LTEXT           "Last name:",IDC_STATIC_LASTNAME,218,24,38,10,NOT

+                    WS_GROUP

+    EDITTEXT        IDC_EDIT_LASTNAME,218,37,57,13,ES_AUTOHSCROLL

+    LTEXT           "Password:",IDC_STATIC_PASSWORD,152,55,38,10

+    EDITTEXT        IDC_EDIT_PASSWORD,152,71,123,13,ES_PASSWORD |

+                    ES_AUTOHSCROLL

+    CONTROL         "Remember password for next time",IDC_REMEMBER_PASSWORD,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,84,123,10

+    LTEXT           "Return to:",IDC_STATIC,152,97,32,8

+    CONTROL         "Last location",IDC_RADIO_LAST,"Button",

+                    BS_AUTORADIOBUTTON | WS_TABSTOP,152,109,56,10

+    CONTROL         "Home",IDC_RADIO_HOME,"Button",BS_AUTORADIOBUTTON |

+                    WS_TABSTOP,218,109,35,10

+    LTEXT           "Server:",IDC_STATIC_SERVER,152,119,38,10,NOT WS_GROUP

+    COMBOBOX        IDC_COMBO_SERVER,152,134,88,43,CBS_DROPDOWN | WS_VSCROLL |

+                    WS_TABSTOP

+    PUSHBUTTON      "Quit",IDCANCEL,152,152,50,14

+    DEFPUSHBUTTON   "Connect...",IDOK,225,152,50,14

+    CONTROL         140,IDB_BITMAP1,"Static",SS_BITMAP,8,7,133,157

+    LTEXT           "Connect to Second Life",IDC_STATIC,152,7,78,8

+END

+

+SPLASHSCREEN DIALOG  32, 32, 144, 34

+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE

+FONT 8, "MS Sans Serif"

+BEGIN

+    ICON            IDI_LL_ICON,IDC_STATIC,7,7,20,20

+    LTEXT           "Loading Second Life...",666,36,13,91,8

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// DESIGNINFO

+//

+

+#ifdef APSTUDIO_INVOKED

+GUIDELINES DESIGNINFO

+BEGIN

+    "CONNECTBOX", DIALOG

+    BEGIN

+        LEFTMARGIN, 8

+        RIGHTMARGIN, 180

+        VERTGUIDE, 152

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 239

+        HORZGUIDE, 44

+        HORZGUIDE, 57

+        HORZGUIDE, 123

+    END

+

+    "CONNECTBOXIP", DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 275

+        VERTGUIDE, 152

+        VERTGUIDE, 218

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 166

+        HORZGUIDE, 12

+        HORZGUIDE, 17

+        HORZGUIDE, 24

+        HORZGUIDE, 50

+        HORZGUIDE, 55

+        HORZGUIDE, 84

+        HORZGUIDE, 105

+        HORZGUIDE, 119

+    END

+

+    "SPLASHSCREEN", DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 137

+        VERTGUIDE, 36

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 27

+    END

+END

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Menu

+//

+

+IDR_MENU1 MENU

+BEGIN

+    POPUP "testmenu"

+    BEGIN

+        MENUITEM "test",                        ID_TESTMENU_TEST

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Cursor

+//

+

+TOOLGRAB                CURSOR                  "lltoolgrab.cur"

+TOOLLAND                CURSOR                  "lltoolland.cur"

+TOOLZOOMIN              CURSOR                  "lltoolzoomin.cur"

+TOOLCREATE              CURSOR                  "lltoolcreate.cur"

+ARROWDRAG               CURSOR                  "llarrowdrag.cur"

+ARROW                   CURSOR                  "llarrow.cur"

+NOLOCKED                CURSOR                  "llnolocked.cur"

+ARROWLOCKED             CURSOR                  "llarrowlocked.cur"

+GRABLOCKED              CURSOR                  "llgrablocked.cur"

+TOOLROTATE              CURSOR                  "lltoolrotate.cur"

+TOOLTRANSLATE           CURSOR                  "lltooltranslate.cur"

+TOOLSCALE               CURSOR                  "lltoolscale.cur"

+TOOLCAMERA              CURSOR                  "lltoolcamera.cur"

+TOOLPAN                 CURSOR                  "lltoolpan.cur"

+TOOLFOCUS               CURSOR                  "lltoolfocus.cur"

+TOOLPICKOBJECT3         CURSOR                  "toolpickobject3.cur"

+ARROWCOPY               CURSOR                  "arrowcop.cur"

+ARROWDRAGMULTI          CURSOR                  "llarrowdragmulti.cur"

+ARROWCOPYMULTI          CURSOR                  "arrowcopmulti.cur"

+TOOLSIT                 CURSOR                  "toolsit.cur"

+TOOLBUY                 CURSOR                  "toolbuy.cur"

+TOOLPAY                 CURSOR                  "toolpay.cur"

+TOOLOPEN                CURSOR                  "toolopen.cur"

+TOOLPIPETTE             CURSOR                  "toolpipette.cur"

+TOOLPLAY                CURSOR                  "toolplay.cur"

+TOOLPAUSE               CURSOR                  "toolpause.cur"

+TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 1,20,9,87416

+ PRODUCTVERSION 1,20,9,87416

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x40004L

+ FILETYPE 0x1L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", "Imprudence Viewer Project"

+            VALUE "FileDescription", "Imprudence"

+            VALUE "FileVersion", "1.0.0"

+            VALUE "InternalName", "Imprudence"

+            VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."

+            VALUE "OriginalFilename", "Imprudence.exe"

+            VALUE "ProductName", "Imprudence"

+            VALUE "ProductVersion", "1.0.0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Bitmap

+//

+

+IDB_BITMAP2             BITMAP                  "bitmap2.bmp"

+IDB_LOGIN               BITMAP                  "loginbackground.bmp"

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index 5ea4695..9b99f91 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -376,7 +376,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         }
         else
         {
-                mbstowcs(window_title, "Second Life Updater", 2048);
+                mbstowcs(window_title, "Imprudence Updater", 2048);
         }
         
         WNDCLASSEX wndclassex = { 0 };
@@ -469,11 +469,11 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         if (gTotalBytesRead < (1024 * 1024) && ! cancelled)
         {
                 MessageBox(gWindow,
-                        L"The Second Life auto-update has failed.\n"
+                        L"The Imprudence auto-update has failed.\n"
                         L"The problem may be caused by other software installed \n"
                         L"on your computer, such as a firewall.\n"
-                        L"Please visit http://secondlife.com/download/ \n"
-                        L"to download the latest version of Second Life.\n",
+                        L"Please visit http://imprudenceviewer.org/download/ \n"
+                        L"to download the latest version of Imprudence.\n",
                         NULL, MB_OK);
                 return 1;
         }
@@ -487,7 +487,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         if (!success)
         {
                 MessageBox(gWindow, 
-                        L"Second Life download failed.\n"
+                        L"Imprudence download failed.\n"
                         L"Please try again later.", 
                         NULL, MB_OK);
                 return 1;