summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-11-08 14:37:50 -0600
committerDave Parks <davep@lindenlab.com>2011-11-08 14:37:50 -0600
commitda092a06cf42902de4f5a042fd0b314b34e4392d (patch)
treefecb8acccfee515b56a07ffd85c9d8abb12309a6
parent428b74f14bd3763a6209d6a2132a8d7977958902 (diff)
SH-2608 Fix for debug beacons not rendering properly.
-rw-r--r--indra/newview/pipeline.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 171bd2fa71..49f83fdb0d 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4250,8 +4250,16 @@ void LLPipeline::renderDebug()
bool hud_only = hasRenderType(LLPipeline::RENDER_TYPE_HUD);
+
if (!hud_only && !mDebugBlips.empty())
{ //render debug blips
+ if (LLGLSLShader::sNoFixedFunction)
+ {
+ gUIProgram.bind();
+ }
+
+ gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sWhiteImagep, true);
+
glPointSize(8.f);
LLGLDepthTest depth(GL_TRUE, GL_TRUE, GL_ALWAYS);