summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolsimple.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-05-31 14:42:17 -0500
committerDave Parks <davep@lindenlab.com>2011-05-31 14:42:17 -0500
commit9da4007f85912330a70bc87bfb97cbcf1033e3ab (patch)
tree08f94effb0e9ccd8f17bc214f53e62a14a51b405 /indra/newview/lldrawpoolsimple.cpp
parentfa76b8992c6c636303d398bd25d34c39ae23419e (diff)
parentece32418e7c1828a65c88e526a5afcb635c5453a (diff)
merge
Diffstat (limited to 'indra/newview/lldrawpoolsimple.cpp')
-rw-r--r--indra/newview/lldrawpoolsimple.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp
index 9b73b2f9b6..6963fea26b 100644
--- a/indra/newview/lldrawpoolsimple.cpp
+++ b/indra/newview/lldrawpoolsimple.cpp
@@ -171,8 +171,9 @@ void LLDrawPoolSimple::beginRenderPass(S32 pass)
void LLDrawPoolSimple::endRenderPass(S32 pass)
{
LLFastTimer t(FTM_RENDER_SIMPLE);
+ stop_glerror();
LLRenderPass::endRenderPass(pass);
-
+ stop_glerror();
if (mVertexShaderLevel > 0)
{
simple_shader->unbind();