diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-30 12:17:34 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-30 12:17:34 -0500 |
| commit | a244cff7811b88d76591f429119dd736fa522b1a (patch) | |
| tree | e3a20d039d4fea8971fad1f689ad71e3cff951bf /indra/llrender/llgl.cpp | |
| parent | 886d743a18cf57ca2ebd7ccf6d9c26afc4293140 (diff) | |
MAINT-778, MAINT-793 Fix for crash when enabling Debug GL on Mobile Intel 4 Express. Don't pop up driver update notification if GPU class is < 1
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index f2105f79d0..628a8d6131 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -1912,7 +1912,7 @@ void LLGLState::checkClientArrays(const std::string& msg, U32 data_mask) glClientActiveTextureARB(GL_TEXTURE0_ARB); gGL.getTexUnit(0)->activate(); - if (gGLManager.mHasVertexShader) + if (gGLManager.mHasVertexShader && LLGLSLShader::sNoFixedFunction) { //make sure vertex attribs are all disabled GLint count; glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &count); |