diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-02-03 17:56:36 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-02-03 17:56:36 -0500 |
commit | d49e5bcbe26a4b148ce1d20a60d16581f41134c0 (patch) | |
tree | bd8caf39e789437574119304688ba3c71b7940cf /indra/llrender/llgl.cpp | |
parent | 1e47e5b42d352d5d838eeb96984dbf6497020e32 (diff) | |
parent | 9d71aae8273fd44dada82b1005c121255dc14dda (diff) |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/llrender/llgl.cpp')
-rw-r--r-- | indra/llrender/llgl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 187a9a984e..a3f7a946ec 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -332,6 +332,8 @@ LLGLManager::LLGLManager() : mHasFragmentShader(FALSE), mHasOcclusionQuery(FALSE), mHasPointParameters(FALSE), + mHasDrawBuffers(FALSE), + mHasTextureRectangle(FALSE), mHasAnisotropic(FALSE), mHasARBEnvCombine(FALSE), @@ -671,7 +673,7 @@ void LLGLManager::initExtensions() llinfos << "initExtensions() checking shell variables to adjust features..." << llendl; // Our extension support for the Linux Client is very young with some // potential driver gotchas, so offer a semi-secret way to turn it off. - if (getenv("LL_GL_NOEXT")) /* Flawfinder: ignore */ + if (getenv("LL_GL_NOEXT")) { //mHasMultitexture = FALSE; // NEEDED! mHasARBEnvCombine = FALSE; |