diff options
author | Dave Parks <davep@lindenlab.com> | 2013-06-20 12:10:26 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-06-20 12:10:26 -0500 |
commit | 9ea2d90a0dd9ca9ab76583187354533011ef3fcb (patch) | |
tree | 93be8f1dd703cd87083cf871c1948671e0a8cb97 /indra/newview/lldrawpoolavatar.h | |
parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
parent | f62d04d4256e3ebb7ecf64ea370099c8795e8581 (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/lldrawpoolavatar.h')
-rwxr-xr-x | 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 7d0368a945..4fbda1f862 100755 --- a/indra/newview/lldrawpoolavatar.h +++ b/indra/newview/lldrawpoolavatar.h @@ -133,6 +133,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, |