summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolavatar.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-01-08 09:45:27 -0500
committerOz Linden <oz@lindenlab.com>2013-01-08 09:45:27 -0500
commita7dbaaa0af643fc5bce0b740a92e69dfb931c6e8 (patch)
tree3eddbd3f421f430c9b03487261e89c95017657b9 /indra/newview/lldrawpoolavatar.cpp
parent0d12d171cf20c63a45e7ad0989e65d05aabb86ea (diff)
parent77abdd04a4a390049c2143e1d87542b9b2a06c86 (diff)
merge changes for DRTVWR-250
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
-rw-r--r--indra/newview/lldrawpoolavatar.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 0e15f474c9..294cecc703 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1272,6 +1272,9 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace*
face->setGeomIndex(0);
face->setIndicesIndex(0);
+ //rigged faces do not batch textures
+ face->setTextureIndex(255);
+
if (buffer.isNull() || buffer->getTypeMask() != data_mask || !buffer->isWriteable())
{ //make a new buffer
if (sShaderLevel > 0)