diff options
author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-02 18:56:30 -0500 |
---|---|---|
committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-02 18:56:30 -0500 |
commit | 345c2a02cd1ba7d9e266c6c991d90d15ac7d4b52 (patch) | |
tree | 87f271580dd6e4728896c5ca672120513f794fa0 /indra/newview/llviewerjointmesh.cpp | |
parent | 7e3e89f1270cfb701b314ebd0791e752e1eb4966 (diff) | |
parent | f344c5b7ecf721329ef87044eeec06c6669618d8 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llviewerjointmesh.cpp')
-rw-r--r-- | indra/newview/llviewerjointmesh.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp index cd60a8d560..5b8902dec4 100644 --- a/indra/newview/llviewerjointmesh.cpp +++ b/indra/newview/llviewerjointmesh.cpp @@ -582,7 +582,7 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy) } else { - gGL.getTexUnit(0)->bind(LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT_AVATAR)); + gGL.getTexUnit(0)->bind(LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT)); } if (gRenderForSelect) |