diff options
author | Dave Parks <davep@lindenlab.com> | 2012-12-05 17:40:29 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-12-05 17:40:29 -0600 |
commit | 1f228c22281530a44cfa87a518ec3c1ce54f01d6 (patch) | |
tree | 4a5ae6457a2bceb7d351de2e1a42e93814a25753 /indra/newview/lldrawpoolavatar.h | |
parent | 57db08d7927a4a93b8825405201e9e21efb8c756 (diff) | |
parent | 1ab00f6cd320df528d448cbb9bd837a55d0151f2 (diff) |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/lldrawpoolavatar.h')
-rw-r--r-- | indra/newview/lldrawpoolavatar.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolavatar.h b/indra/newview/lldrawpoolavatar.h index 69e3068858..5551d8f6d8 100644 --- a/indra/newview/lldrawpoolavatar.h +++ b/indra/newview/lldrawpoolavatar.h @@ -129,6 +129,7 @@ public: void endDeferredRiggedSimple(); void endDeferredRiggedBump(); + void getRiggedGeometry(LLFace* face, LLPointer<LLVertexBuffer>& buffer, U32 data_mask, const LLMeshSkinInfo* skin, LLVolume* volume, const LLVolumeFace& vol_face); void updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace* facep, const LLMeshSkinInfo* skin, |