diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-11-30 17:03:48 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-11-30 17:03:48 -0600 |
| commit | 06a5cc52852d2e5b8920206a3f56bfe86ba0bae3 (patch) | |
| tree | 166eb3f7ba8201fb9722e53489630d73e249154d /indra/newview/llappviewer.cpp | |
| parent | 8d07be97750065cacaf513f496935c3f67b8b40a (diff) | |
| parent | e83700b56dcf2b0f392b49a79123b78bc7c8fbd9 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
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 |