From c285dddcca63a901212e61335fba4429062a6c17 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 28 Jan 2011 17:42:02 -0500
Subject: [PATCH] SH-845 FIX - display a message before bailing out if CPU
lacks SSE2 support
---
indra/newview/llappviewer.cpp | 12 ++++++++++++
indra/newview/skins/default/xui/en/notifications.xml | 6 ++++++
2 files changed, 18 insertions(+)
mode change 100644 => 100755 indra/newview/llappviewer.cpp
mode change 100644 => 100755 indra/newview/skins/default/xui/en/notifications.xml
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
old mode 100644
new mode 100755
index 2d4838814e3..e74a7a84c38
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -897,6 +897,18 @@ bool LLAppViewer::init()
return 0;
}
+ // Without SSE2 support we will crash almost immediately, warn here.
+ if (!gSysCPU.hasSSE2())
+ {
+ // can't use an alert here since we're exiting and
+ // all hell breaks lose.
+ OSMessageBox(
+ LLNotifications::instance().getGlobalString("UnsupportedCPUSSE2"),
+ LLStringUtil::null,
+ OSMB_OK);
+ return 0;
+ }
+
// alert the user if they are using unsupported hardware
if(!gSavedSettings.getBOOL("AlertedUnsupportedHardware"))
{
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
old mode 100644
new mode 100755
index 4fbe7b564f2..de133790991
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6737,6 +6737,12 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm '
- Your CPU speed does not meet the minimum requirements.
</global>
+ <global name="UnsupportedCPUSSE2">
+Your CPU does not seem to have the required support for SSE2 operations.
+
+Please see http://www.secondlife.com/corporate/sysreqs.php for information about system requirements.
+ </global>
+
<global name="UnsupportedGLRequirements">
You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
--
GitLab