summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmorph.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-09-13 16:11:22 -0500
committerDave Parks <davep@lindenlab.com>2011-09-13 16:11:22 -0500
commitc0ca2c62fd6b9a90542907ce46bf1fe0ab379e13 (patch)
tree69bed5c3a72357e183384917b5495c2990e1ac13 /indra/newview/lltoolmorph.cpp
parent19371a9abed3198f9f6083c3b2483e65778e944a (diff)
parent38c19f4e55c0f6a104de87dfb57313a6c529b4d6 (diff)
merge
Diffstat (limited to 'indra/newview/lltoolmorph.cpp')
-rw-r--r--indra/newview/lltoolmorph.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp
index 964b17d3a6..eeb90a2b19 100644
--- a/indra/newview/lltoolmorph.cpp
+++ b/indra/newview/lltoolmorph.cpp
@@ -178,6 +178,11 @@ BOOL LLVisualParamHint::render()
gGL.pushMatrix();
glLoadIdentity();
+ if (LLGLSLShader::sNoFixedFunction)
+ {
+ gUIProgram.bind();
+ }
+
LLGLSUIDefault gls_ui;
//LLGLState::verify(TRUE);
mBackgroundp->draw(0, 0, mFullWidth, mFullHeight);