diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-07 08:40:59 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-07 08:40:59 +0100 |
| commit | c3cdb8ced6ad9cedf9a4b37d19d302c59d33d72c (patch) | |
| tree | f0c5484493ffc1319439f31b1df77bf9d818bdbb /indra/newview/llvoavatar.h | |
| parent | b89c31052802450ec59fee48ace4c66a713755ab (diff) | |
| parent | aad87303c88458c9db3c312d44e8a4b125de1fe3 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index c80d59966c..ff984d76c3 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -337,7 +337,6 @@ private: **/ public: - U32 renderFootShadows(); U32 renderImpostor(LLColor4U color = LLColor4U(255,255,255,255), S32 diffuse_channel = 0); U32 renderRigid(); U32 renderSkinned(EAvatarRenderPass pass); @@ -571,7 +570,8 @@ protected: void releaseMeshData(); virtual void restoreMeshData(); private: - BOOL mDirtyMesh; + void dirtyMesh(S32 priority); // Dirty the avatar mesh, with priority + S32 mDirtyMesh; // 0 -- not dirty, 1 -- morphed, 2 -- LOD BOOL mMeshTexturesDirty; typedef std::multimap<std::string, LLPolyMesh*> polymesh_map_t; |