summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmorph.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-08-19 16:34:34 -0500
committerDave Parks <davep@lindenlab.com>2011-08-19 16:34:34 -0500
commit233e42b3314c17b2e24334587d960af6e3dc963c (patch)
tree480e571bf913bb0743c3c6c6ce846a69aa405504 /indra/newview/lltoolmorph.cpp
parent0e496309d6cb7581c9f69b7da244699c382750ac (diff)
parent80398b3ccb0c4a6ff3ac20b3565619fe5cecc2f9 (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);