diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-14 17:56:55 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-14 17:56:55 -0500 |
| commit | 984feefbecd0338618ea499dc1fa44c5a5fe747d (patch) | |
| tree | 2114f73857009a983ca7b1ce90e2bf36237c57b9 /indra/newview/lldrawpoolavatar.h | |
| parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
| parent | baa0ff7d3e34053a1dbc8c5207fe899d9e201ee0 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawpoolavatar.h')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolavatar.h b/indra/newview/lldrawpoolavatar.h index fcd8294af5..69e3068858 100644 --- a/indra/newview/lldrawpoolavatar.h +++ b/indra/newview/lldrawpoolavatar.h @@ -134,6 +134,7 @@ public: const LLMeshSkinInfo* skin, LLVolume* volume, const LLVolumeFace& vol_face); + void updateRiggedVertexBuffers(LLVOAvatar* avatar); void renderRigged(LLVOAvatar* avatar, U32 type, bool glow = false); void renderRiggedSimple(LLVOAvatar* avatar); @@ -176,6 +177,7 @@ public: RIGGED_FULLBRIGHT_SHINY_MASK = RIGGED_SIMPLE_MASK, RIGGED_GLOW_MASK = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | + LLVertexBuffer::MAP_EMISSIVE | LLVertexBuffer::MAP_WEIGHT4, RIGGED_ALPHA_MASK = RIGGED_SIMPLE_MASK, RIGGED_FULLBRIGHT_ALPHA_MASK = RIGGED_FULLBRIGHT_MASK, @@ -214,7 +216,6 @@ class LLVertexBufferAvatar : public LLVertexBuffer { public: LLVertexBufferAvatar(); - virtual void setupVertexBuffer(U32 data_mask) const; }; extern S32 AVATAR_OFFSET_POS; |