summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-10-25 15:07:57 -0500
committerDave Parks <davep@lindenlab.com>2011-10-25 15:07:57 -0500
commit7dafa1be79f4e3f454ce022326cb09fa5cabb003 (patch)
treeada853a78bca98f0cf4ed19d628690e7e2692f9d /indra/llrender
parent30d1a2d053fe7d6e0c88928cf51aa73865ee21e8 (diff)
SH-2622 Put back "Basic Shaders" toggle ability.
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llgl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index c0d15fe6f3..381f52a37c 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -1767,7 +1767,7 @@ void LLGLState::checkClientArrays(const std::string& msg, U32 data_mask)
error = TRUE;
}
- glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &active_texture);
+ /*glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &active_texture);
if (active_texture != GL_TEXTURE0_ARB)
{
llwarns << "Active texture corrupted: " << active_texture << llendl;
@@ -1776,7 +1776,7 @@ void LLGLState::checkClientArrays(const std::string& msg, U32 data_mask)
gFailLog << "Active texture corrupted: " << active_texture << std::endl;
}
error = TRUE;
- }
+ }*/
static const char* label[] =
{