diff options
| author | Tank_Master <tank.master@phoenixviewer.com> | 2014-03-13 20:08:15 -0700 |
|---|---|---|
| committer | Tank_Master <tank.master@phoenixviewer.com> | 2014-03-13 20:08:15 -0700 |
| commit | a04ad99064006322af2bc78848554df4267b0468 (patch) | |
| tree | 301b85687eeb71a9ae0f8d3509a80630fd0cbca4 | |
| parent | b6708435214a5af158956b0f6ef6a90bacbcc142 (diff) | |
Open-154 Better service pack detection for Vista and Server 2008
| -rwxr-xr-x | indra/newview/installers/windows/installer_template.nsi | 28 |
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
|