diff options
author | Dave Parks <davep@lindenlab.com> | 2011-04-19 14:55:11 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-04-19 14:55:11 -0500 |
commit | 3b5d6eed12d928e5a7a0bc3a8d827f676b25d060 (patch) | |
tree | 8cf08a165c11acf92742eacc64248c1e50b2420b /indra/newview/llfeaturemanager.cpp | |
parent | b8069d1c250c03e9fffda0a9264bfd04a12f8292 (diff) | |
parent | 12b0b52b99e6f6a6538feba8589566d2f73f82c6 (diff) |
merge
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
-rw-r--r-- | indra/newview/llfeaturemanager.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 4e16cc4217..9f0b34becc 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -729,6 +729,10 @@ void LLFeatureManager::applyBaseMasks() { maskFeatures("ATI"); } + if (gGLManager.mHasATIMemInfo && gGLManager.mVRAM < 256) + { + maskFeatures("ATIVramLT256"); + } if (gGLManager.mATIOldDriver) { maskFeatures("ATIOldDriver"); @@ -745,6 +749,10 @@ void LLFeatureManager::applyBaseMasks() { maskFeatures("OpenGLPre15"); } + if (gGLManager.mGLVersion < 3.f) + { + maskFeatures("OpenGLPre30"); + } // now mask by gpu string // Replaces ' ' with '_' in mGPUString to deal with inability for parser to handle spaces |