diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-20 16:05:29 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-20 16:05:29 -0500 |
| commit | 513c1d97440a09e50a1f5f9ae2ab5ed1146a784d (patch) | |
| tree | cac55a7183ab42f3f53c638ab5bbb717f644d28b /indra/newview/llfeaturemanager.cpp | |
| parent | f0036519d031f4a5a19181c90839d313920b07f3 (diff) | |
SH-795 Potential fix for crash after setting graphics detail to low.
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 82f38ae4e9..ec2493dd2e 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -670,7 +670,14 @@ void LLFeatureManager::setGraphicsLevel(S32 level, bool skipFeatures) switch (level) { case 0: - maskFeatures("Low"); + if (gGLManager.mGLVersion < 3.f || gGLManager.mIsIntel) + { //only use fixed function by default if GL version < 3.0 or this is an intel graphics chip + maskFeatures("LowFixedFunction"); + } + else + { //same as low, but with "Basic Shaders" enabled + maskFeatures("Low"); + } break; case 1: maskFeatures("Mid"); |