summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerjointmesh.cpp
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-11-04 17:04:17 -0800
committerPalmer <palmer@lindenlab.com>2009-11-04 17:04:17 -0800
commitd5cceb9d2f05ba4e19da3cc50ef273aa4dffc453 (patch)
treede0a6cf70ec27964f2b08040c9f217114bd49fa4 /indra/newview/llviewerjointmesh.cpp
parentc4817c4e5856577ff56f34ba48e12cef5ee7ab6d (diff)
parent71dc13aac99458989776e93c38294f507074fce4 (diff)
Almost automated merge
Diffstat (limited to 'indra/newview/llviewerjointmesh.cpp')
-rw-r--r--indra/newview/llviewerjointmesh.cpp2
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)