summaryrefslogtreecommitdiff
path: root/indra/newview/installers/windows
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/installers/windows')
-rwxr-xr-xindra/newview/installers/windows/installer_template.nsi28
1 files changed, 20 insertions, 8 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 85fa160bb9..8b3a9a8372 100755
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -189,20 +189,32 @@ FunctionEnd
;Recommend Upgrading Service Pack
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function CheckWindowsServPack
- ${If} ${IsWinXP}
- ${AndIfNot} ${IsServicePack} 3
- ${OrIf} ${IsWin2003}
- ${AndIfNot} ${IsServicePack} 2
- ${OrIf} ${IsWinVista}
+ ${If} ${IsWinVista}
${AndIfNot} ${IsServicePack} 2
- ${OrIf} ${IsWin2008}
+ MessageBox MB_OK $(CheckWindowsServPackMB)
+ DetailPrint $(UseLatestServPackDP)
+ Return
+ ${EndIf}
+
+ ${If} ${IsWin2008}
${AndIfNot} ${IsServicePack} 2
- ${OrIf} ${IsWin7}
+ MessageBox MB_OK $(CheckWindowsServPackMB)
+ DetailPrint $(UseLatestServPackDP)
+ Return
+ ${EndIf}
+
+ ${If} ${IsWin7}
${AndIfNot} ${IsServicePack} 1
- ${OrIf} ${IsWin2008R2}
+ MessageBox MB_OK $(CheckWindowsServPackMB)
+ DetailPrint $(UseLatestServPackDP)
+ Return
+ ${EndIf}
+
+ ${If} ${IsWin2008R2}
${AndIfNot} ${IsServicePack} 1
MessageBox MB_OK $(CheckWindowsServPackMB)
DetailPrint $(UseLatestServPackDP)
+ Return
${EndIf}
FunctionEnd