summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerjointmesh.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-03 09:44:09 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-03 09:44:09 -0800
commita0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (patch)
tree279f3421a88280d6003d6973dcb5556702e2c52f /indra/newview/llviewerjointmesh.cpp
parentc59e2d21174415842b1418c5f389becb7c013706 (diff)
parentc9d121dd01625790cb963372c861f8e4072430d2 (diff)
merge from remote repo
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)