diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-06-22 18:59:31 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-22 18:59:31 -0700 |
commit | 6e710333e7ea08a79c401ae54d063d8ef608f99a (patch) | |
tree | ff0dbcf29032ff9da18c8d86be7dd622ed180583 /indra/newview/llviewerjointmesh.cpp | |
parent | 7cc44fb7fe40706e2017343d76ed226f477dad8d (diff) | |
parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/newview/llviewerjointmesh.cpp')
-rw-r--r-- | indra/newview/llviewerjointmesh.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp index e052e37393..f029ae5302 100644 --- a/indra/newview/llviewerjointmesh.cpp +++ b/indra/newview/llviewerjointmesh.cpp @@ -576,7 +576,6 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy) { old_mode = mTexture->getAddressMode(); } - gGL.getTexUnit(diffuse_channel)->bind(mTexture.get()); gGL.getTexUnit(diffuse_channel)->bind(mTexture); gGL.getTexUnit(diffuse_channel)->setTextureAddressMode(LLTexUnit::TAM_CLAMP); } |