summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-02-01 11:16:43 -0500
committerLoren Shih <seraph@lindenlab.com>2011-02-01 11:16:43 -0500
commit293b35f000ca4e8a4bcf85dc4782b2a72d1887ea (patch)
tree70c1731808e5449a56b8a38007c6c952bb559f48 /indra/newview/llappviewer.cpp
parentd0cba9e9194841e8867afcbd02b3792b652756ab (diff)
parentee39db49a38a626e72e1924e4c157b16d90e8ee6 (diff)
Automated merge from mesh-development
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2d4838814e..e74a7a84c3 100644
--- 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"))
{