summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-10-20 15:14:51 -0500
committerDave Parks <davep@lindenlab.com>2011-10-20 15:14:51 -0500
commit281b71300d0296f54809948d16c778b6bf08ef19 (patch)
tree7dad16fec9dcf4b1853df0efb0467c19cd62e970 /indra
parentae31a6f4a7928e4f1be75451ec7dd16c5283ed5b (diff)
SH-2521 Force terrain to render as simple when GL version < 2.0
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lldrawpoolterrain.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp
index e14d0c5f9d..ce601325c8 100644
--- a/indra/newview/lldrawpoolterrain.cpp
+++ b/indra/newview/lldrawpoolterrain.cpp
@@ -196,7 +196,7 @@ void LLDrawPoolTerrain::render(S32 pass)
return;
}
// Render simplified land if video card can't do sufficient multitexturing
- if (!gGLManager.mHasARBEnvCombine || (gGLManager.mNumTextureUnits < 2))
+ if (!LLGLSLShader::sNoFixedFunction || !gGLManager.mHasARBEnvCombine || (gGLManager.mNumTextureUnits < 2))
{
renderSimple(); // Render without multitexture
return;