diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-25 14:22:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-25 14:22:33 -0400 |
| commit | ee66cb3efccd6976c5a7725620956ea7030b7b57 (patch) | |
| tree | 7ae469e4d2aac985589e7df902959b27c603b2ad /indra/newview/llviewerjointmesh.cpp | |
| parent | 5ef8372e433896be174d7123bd4663087601a0df (diff) | |
| parent | 3e8dab32ee88e0a6fda51c218c61d718cf9dcafa (diff) | |
merge back beta tags
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); } |