summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-09-25 23:27:15 +0000
committerDon Kjer <don@lindenlab.com>2012-09-25 23:27:15 +0000
commit3d698286fbdcdfc0c9bdcb873f0d2af124640a0b (patch)
tree697249f67c7155783d1c03456002a592c07c5490 /indra
parentd3924200b6b8817461c0f10f87a643005466d4af (diff)
Wrapping failing llgl assert in gDebugGL
Diffstat (limited to 'indra')
-rw-r--r--indra/llrender/llgl.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index a53c3ca9b7..e28e3157d2 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -1951,7 +1951,10 @@ LLGLState::LLGLState(LLGLenum state, S32 enabled) :
if (mState)
{
mWasEnabled = sStateMap[state];
- llassert(mWasEnabled == glIsEnabled(state));
+ if (gDebugGL)
+ {
+ llassert(mWasEnabled == glIsEnabled(state));
+ }
setEnabled(enabled);
stop_glerror();
}