summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmorph.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-09-14 16:57:42 -0500
committerDave Parks <davep@lindenlab.com>2011-09-14 16:57:42 -0500
commit4e006b0e3891d5728a6753059f2c5afc77737482 (patch)
tree96af37ac252d823f8dc51e20546848ad464e0274 /indra/newview/lltoolmorph.cpp
parent758b936deaa0e6ea397c49afa5024315415eeb93 (diff)
parentc0ca2c62fd6b9a90542907ce46bf1fe0ab379e13 (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);