summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmorph.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-08-21 16:23:50 -0500
committerDave Parks <davep@lindenlab.com>2011-08-21 16:23:50 -0500
commit90ebaeef9b629cb63e7a94a526478f2e340ff439 (patch)
tree14f61c7fc6c2c41cace22a9582075d54ad8181bc /indra/newview/lltoolmorph.cpp
parent63c420d8ddb7cc738877d2771b1c3b8972a4de09 (diff)
parentee4fdd2c18c722164d78a7305777fad6e49cba8b (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);