summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolavatar.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-08-10 15:34:48 -0500
committerDave Parks <davep@lindenlab.com>2011-08-10 15:34:48 -0500
commit364f8771ed6b7a4fabaf2ec1e547aafb8227c876 (patch)
tree99584bd8eae60bc6bb14ec547ca63f89ec8c9a63 /indra/newview/lldrawpoolavatar.cpp
parent265db1f17c74c8e21a532e2e85a623383ef84728 (diff)
Merge cleanup.
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
-rw-r--r--indra/newview/lldrawpoolavatar.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 082448d95c..f0eb52909d 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -581,11 +581,6 @@ void LLDrawPoolAvatar::beginImpostor()
gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
sDiffuseChannel = 0;
-
- if (LLGLSLShader::sNoFixedFunction)
- {
- gUIProgram.bind();
- }
}
void LLDrawPoolAvatar::endImpostor()
@@ -595,10 +590,6 @@ void LLDrawPoolAvatar::endImpostor()
gImpostorProgram.unbind();
}
gPipeline.enableLightsDynamic();
- if (LLGLSLShader::sNoFixedFunction)
- {
- gUIProgram.unbind();
- }
}
void LLDrawPoolAvatar::beginRigid()