summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2017-11-14 19:52:15 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2017-11-14 19:52:15 +0200
commite2e23eb5cba261944ec2d4faae3da010d4290f6f (patch)
treeac6feb857c6572bb1ce8c16c08fd39e9e90ddb04 /indra
parent83b0467f9f16387dc8e13ba7e4bf4f556512ddf3 (diff)
parent6502e8bf33e6775d160ec90c666bb507bd9bb242 (diff)
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lldrawpoolavatar.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index bb5c86f705..e38c7ee080 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1613,6 +1613,14 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(
}
}
+ if (buffer.isNull() ||
+ buffer->getNumVerts() != vol_face.mNumVertices ||
+ buffer->getNumIndices() != vol_face.mNumIndices)
+ {
+ // Allocation failed
+ return;
+ }
+
if (sShaderLevel <= 0 && face->mLastSkinTime < avatar->getLastSkinTime())
{
//perform software vertex skinning for this face