diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-02 11:46:18 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-02 11:46:18 -0500 |
| commit | 55f69de90c9b32c7fa25f16ec7d1f41064eff614 (patch) | |
| tree | 054b0d99490cc6600b3be0e3cb2aaf7918f3fe50 /indra/newview/lldrawpoolavatar.h | |
| parent | 8f47f2222c207938c8fc55158a6fff64ccf1e781 (diff) | |
| parent | 1bea08335b6c2fa31f414db2fe7316a118b2ec18 (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; |