1 files changed, 151 insertions, 151 deletions

diff --git a/OpenSim/Tools/Windows/Installer/OpenSim.nsi b/OpenSim/Tools/Windows/Installer/OpenSim.nsi
index d1df7ba..25f33d1 100644
--- a/OpenSim/Tools/Windows/Installer/OpenSim.nsi
+++ b/OpenSim/Tools/Windows/Installer/OpenSim.nsi
@@ -1,151 +1,151 @@
-!include "MUI.nsh"

-

-Name "OpenSim"

-OutFile "OpenSim Setup 0.4.exe"

-

-CRCCheck On

-

-InstallDir "$PROGRAMFILES\OpenSim"

-InstallDirRegKey HKCU "Software\OpenSim" ""

-

-;Vista redirects $SMPROGRAMS to all users without this

-RequestExecutionLevel admin

-

-Var MUI_TEMP

-Var STARTMENU_FOLDER

-

-!define MUI_LANGDLL_REGISTRY_ROOT "HKCU" 

-!define MUI_LANGDLL_REGISTRY_KEY "Software\OpenSim" 

-!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"

-

-!define MUI_ABORTWARNING

-

-!insertmacro MUI_PAGE_WELCOME

-!insertmacro MUI_PAGE_LICENSE "LICENSE.txt"

-!insertmacro MUI_PAGE_DIRECTORY

-

-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" 

-!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\OpenSim" 

-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"

-  

-!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER

-

-!insertmacro MUI_PAGE_INSTFILES

-!insertmacro MUI_PAGE_FINISH

-

-!insertmacro MUI_UNPAGE_WELCOME

-!insertmacro MUI_UNPAGE_CONFIRM

-!insertmacro MUI_UNPAGE_INSTFILES

-!insertmacro MUI_UNPAGE_FINISH

-

-!insertmacro MUI_LANGUAGE "English"

-!insertmacro MUI_LANGUAGE "French"

-!insertmacro MUI_LANGUAGE "German"

-!insertmacro MUI_LANGUAGE "Spanish"

-!insertmacro MUI_LANGUAGE "SpanishInternational"

-!insertmacro MUI_LANGUAGE "SimpChinese"

-!insertmacro MUI_LANGUAGE "TradChinese"

-!insertmacro MUI_LANGUAGE "Japanese"

-!insertmacro MUI_LANGUAGE "Korean"

-!insertmacro MUI_LANGUAGE "Italian"

-!insertmacro MUI_LANGUAGE "Dutch"

-!insertmacro MUI_LANGUAGE "Danish"

-!insertmacro MUI_LANGUAGE "Swedish"

-!insertmacro MUI_LANGUAGE "Norwegian"

-!insertmacro MUI_LANGUAGE "NorwegianNynorsk"

-!insertmacro MUI_LANGUAGE "Finnish"

-!insertmacro MUI_LANGUAGE "Greek"

-!insertmacro MUI_LANGUAGE "Russian"

-!insertmacro MUI_LANGUAGE "Portuguese"

-!insertmacro MUI_LANGUAGE "PortugueseBR"

-!insertmacro MUI_LANGUAGE "Polish"

-!insertmacro MUI_LANGUAGE "Ukrainian"

-!insertmacro MUI_LANGUAGE "Czech"

-!insertmacro MUI_LANGUAGE "Slovak"

-!insertmacro MUI_LANGUAGE "Croatian"

-!insertmacro MUI_LANGUAGE "Bulgarian"

-!insertmacro MUI_LANGUAGE "Hungarian"

-!insertmacro MUI_LANGUAGE "Thai"

-!insertmacro MUI_LANGUAGE "Romanian"

-!insertmacro MUI_LANGUAGE "Latvian"

-!insertmacro MUI_LANGUAGE "Macedonian"

-!insertmacro MUI_LANGUAGE "Estonian"

-!insertmacro MUI_LANGUAGE "Turkish"

-!insertmacro MUI_LANGUAGE "Lithuanian"

-!insertmacro MUI_LANGUAGE "Slovenian"

-!insertmacro MUI_LANGUAGE "Serbian"

-!insertmacro MUI_LANGUAGE "SerbianLatin"

-!insertmacro MUI_LANGUAGE "Arabic"

-!insertmacro MUI_LANGUAGE "Farsi"

-!insertmacro MUI_LANGUAGE "Hebrew"

-!insertmacro MUI_LANGUAGE "Indonesian"

-!insertmacro MUI_LANGUAGE "Mongolian"

-!insertmacro MUI_LANGUAGE "Luxembourgish"

-!insertmacro MUI_LANGUAGE "Albanian"

-!insertmacro MUI_LANGUAGE "Breton"

-!insertmacro MUI_LANGUAGE "Belarusian"

-!insertmacro MUI_LANGUAGE "Icelandic"

-!insertmacro MUI_LANGUAGE "Malay"

-!insertmacro MUI_LANGUAGE "Bosnian"

-!insertmacro MUI_LANGUAGE "Kurdish"

-!insertmacro MUI_LANGUAGE "Irish"

-!insertmacro MUI_LANGUAGE "Uzbek"

-!insertmacro MUI_LANGUAGE "Galician"

-!insertmacro MUI_LANGUAGE "Afrikaans"

-!insertmacro MUI_LANGUAGE "Catalan"

-

-!insertmacro MUI_RESERVEFILE_LANGDLL

-

-Section "Install"

-  SetOutPath "$INSTDIR"

-

-  SetCompress Auto

-  SetOverwrite IfNewer

-  File /r "bin\*.*"

-

-  WriteRegStr HKCU "Software\OpenSim" "" $INSTDIR

-  WriteUninstaller "$INSTDIR\Uninstall.exe"

-

-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application

-    CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"

-    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenSim.lnk" "$INSTDIR\OpenSim.exe"

-    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"

-  !insertmacro MUI_STARTMENU_WRITE_END

-

-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenSim" "DisplayName" "OpenSim (remove only)"

-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenSim" "UninstallString" "$INSTDIR\Uninstall.exe"

-SectionEnd

-

-Function .onInit

-  !insertmacro MUI_LANGDLL_DISPLAY

-FunctionEnd

-

-Section "Uninstall"

-  Delete "$INSTDIR\*.*"

-  RMDir /r "$INSTDIR"

-

-!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP

-    

-  Delete "$SMPROGRAMS\$MUI_TEMP\OpenSim.lnk"

-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"

-  

-  ;Delete empty start menu parent diretories

-  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"

- 

-  startMenuDeleteLoop:

-    ClearErrors

-    RMDir $MUI_TEMP

-    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."

-    

-    IfErrors startMenuDeleteLoopDone

-  

-    StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop

-  startMenuDeleteLoopDone:

-

-  DeleteRegKey /ifempty HKCU "Software\OpenSim"

-  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenSim"

-SectionEnd

-

-Function un.onInit

-  !insertmacro MUI_UNGETLANGUAGE

-FunctionEnd

+!include "MUI.nsh"
+
+Name "OpenSim"
+OutFile "OpenSim Setup 0.4.exe"
+
+CRCCheck On
+
+InstallDir "$PROGRAMFILES\OpenSim"
+InstallDirRegKey HKCU "Software\OpenSim" ""
+
+;Vista redirects $SMPROGRAMS to all users without this
+RequestExecutionLevel admin
+
+Var MUI_TEMP
+Var STARTMENU_FOLDER
+
+!define MUI_LANGDLL_REGISTRY_ROOT "HKCU" 
+!define MUI_LANGDLL_REGISTRY_KEY "Software\OpenSim" 
+!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
+
+!define MUI_ABORTWARNING
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "LICENSE.txt"
+!insertmacro MUI_PAGE_DIRECTORY
+
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" 
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\OpenSim" 
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+  
+!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "SpanishInternational"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "TradChinese"
+!insertmacro MUI_LANGUAGE "Japanese"
+!insertmacro MUI_LANGUAGE "Korean"
+!insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Dutch"
+!insertmacro MUI_LANGUAGE "Danish"
+!insertmacro MUI_LANGUAGE "Swedish"
+!insertmacro MUI_LANGUAGE "Norwegian"
+!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
+!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "Greek"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "Ukrainian"
+!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "Slovak"
+!insertmacro MUI_LANGUAGE "Croatian"
+!insertmacro MUI_LANGUAGE "Bulgarian"
+!insertmacro MUI_LANGUAGE "Hungarian"
+!insertmacro MUI_LANGUAGE "Thai"
+!insertmacro MUI_LANGUAGE "Romanian"
+!insertmacro MUI_LANGUAGE "Latvian"
+!insertmacro MUI_LANGUAGE "Macedonian"
+!insertmacro MUI_LANGUAGE "Estonian"
+!insertmacro MUI_LANGUAGE "Turkish"
+!insertmacro MUI_LANGUAGE "Lithuanian"
+!insertmacro MUI_LANGUAGE "Slovenian"
+!insertmacro MUI_LANGUAGE "Serbian"
+!insertmacro MUI_LANGUAGE "SerbianLatin"
+!insertmacro MUI_LANGUAGE "Arabic"
+!insertmacro MUI_LANGUAGE "Farsi"
+!insertmacro MUI_LANGUAGE "Hebrew"
+!insertmacro MUI_LANGUAGE "Indonesian"
+!insertmacro MUI_LANGUAGE "Mongolian"
+!insertmacro MUI_LANGUAGE "Luxembourgish"
+!insertmacro MUI_LANGUAGE "Albanian"
+!insertmacro MUI_LANGUAGE "Breton"
+!insertmacro MUI_LANGUAGE "Belarusian"
+!insertmacro MUI_LANGUAGE "Icelandic"
+!insertmacro MUI_LANGUAGE "Malay"
+!insertmacro MUI_LANGUAGE "Bosnian"
+!insertmacro MUI_LANGUAGE "Kurdish"
+!insertmacro MUI_LANGUAGE "Irish"
+!insertmacro MUI_LANGUAGE "Uzbek"
+!insertmacro MUI_LANGUAGE "Galician"
+!insertmacro MUI_LANGUAGE "Afrikaans"
+!insertmacro MUI_LANGUAGE "Catalan"
+
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+Section "Install"
+  SetOutPath "$INSTDIR"
+
+  SetCompress Auto
+  SetOverwrite IfNewer
+  File /r "bin\*.*"
+
+  WriteRegStr HKCU "Software\OpenSim" "" $INSTDIR
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenSim.lnk" "$INSTDIR\OpenSim.exe"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+  !insertmacro MUI_STARTMENU_WRITE_END
+
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenSim" "DisplayName" "OpenSim (remove only)"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenSim" "UninstallString" "$INSTDIR\Uninstall.exe"
+SectionEnd
+
+Function .onInit
+  !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+Section "Uninstall"
+  Delete "$INSTDIR\*.*"
+  RMDir /r "$INSTDIR"
+
+!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+    
+  Delete "$SMPROGRAMS\$MUI_TEMP\OpenSim.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+  
+  ;Delete empty start menu parent diretories
+  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
+ 
+  startMenuDeleteLoop:
+    ClearErrors
+    RMDir $MUI_TEMP
+    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
+    
+    IfErrors startMenuDeleteLoopDone
+  
+    StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop
+  startMenuDeleteLoopDone:
+
+  DeleteRegKey /ifempty HKCU "Software\OpenSim"
+  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenSim"
+SectionEnd
+
+Function un.onInit
+  !insertmacro MUI_UNGETLANGUAGE
+FunctionEnd