diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-22 06:03:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-22 06:03:42 -0400 |
| commit | 7637acf76e6a1170508e8bddd381c426d219b1ee (patch) | |
| tree | c48b5ea58fda587a103278860b943122f6ce8fae /indra/newview/llviewerjointmesh.cpp | |
| parent | 6525fc4a4fc09e02c4fa709e0cbba4aa8d7d25ae (diff) | |
| parent | c4dfdcb338aaeeb4e3adc4e1aef4f5b190ef5c57 (diff) | |
merge changes for DRTVWR-149
Diffstat (limited to 'indra/newview/llviewerjointmesh.cpp')
| -rwxr-xr-x[-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..100755 --- 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); } |