summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerjointmesh.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-11-03 15:32:54 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-11-03 15:32:54 +0200
commit4a3eeda1ea5b555d15758dd7abee9b11c980e5b3 (patch)
tree400016fada68cf72c5bd64bd1e972ecdf100f530 /indra/newview/llviewerjointmesh.cpp
parent645e2588511ff55b773e22fe3c9ee2c4de37843c (diff)
parenteff50b018c93f7ddf328c750ddbea11f0a50f9c1 (diff)
Merge from default branch
--HG-- branch : product-engine
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)