diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-28 00:50:05 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-28 00:50:05 -0500 |
| commit | 98dd237438011a81690fd704c593a181a76f14d9 (patch) | |
| tree | 4bca7d3563b5db1c35b73843c98e666b0fd4354a /indra/llrender | |
| parent | e4ed409ec3dc5dda151323bc0b4efa8677ee0bb1 (diff) | |
| parent | 76634dc7afd768c2c33b7aac16f248a82513459c (diff) | |
merge
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llgl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index a819ab0b79..f2105f79d0 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -745,8 +745,8 @@ bool LLGLManager::initGL() } #endif - if (mIsIntel) - { //never try to use framebuffer objects on intel (crashy) + if (mIsIntel && mGLVersion <= 3.f) + { //never try to use framebuffer objects on older intel drivers (crashy) mHasFramebufferObject = FALSE; } |