diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
| commit | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (patch) | |
| tree | f59f5e404f8417c8fea632592b7256c2f677b399 /indra/newview/llappviewer.cpp | |
| parent | bf55755262244c7c36df781d2e093b4109f6ecbf (diff) | |
| parent | 42a33b6c6250aca7e459f95cd13b0d0600cd6262 (diff) | |
merge changes for DRTVWR-276
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index f203ac224b..1000c0e1e8 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1030,11 +1030,20 @@ bool LLAppViewer::init() } #if LL_WINDOWS - if (gGLManager.mIsIntel && - LLFeatureManager::getInstance()->getGPUClass() > 0 && - gGLManager.mGLVersion <= 3.f) + if (gGLManager.mGLVersion < LLFeatureManager::getInstance()->getExpectedGLVersion()) { - LLNotificationsUtil::add("IntelOldDriver"); + if (gGLManager.mIsIntel) + { + LLNotificationsUtil::add("IntelOldDriver"); + } + else if (gGLManager.mIsNVIDIA) + { + LLNotificationsUtil::add("NVIDIAOldDriver"); + } + else if (gGLManager.mIsATI) + { + LLNotificationsUtil::add("AMDOldDriver"); + } } #endif |