summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerjointmesh.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-02 16:43:35 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-02 16:43:35 -0800
commit967e171ed67449b9e97c16425df9114e4c7dd48c (patch)
tree9ffdf1183777390407ad57ba900e557a60c039fb /indra/newview/llviewerjointmesh.cpp
parent44eea89d001ccb09343dda973af0dabecb1ec48d (diff)
parent345c2a02cd1ba7d9e266c6c991d90d15ac7d4b52 (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)