diff options
| author | Richard Nelson <none@none> | 2010-07-20 11:31:23 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-07-20 11:31:23 -0700 |
| commit | 572e72d8a1cb777b0d60cdfa389f3e397a652da9 (patch) | |
| tree | c9e7f05654525d3a5ed2d89267462f92b5e8fd6f /indra/newview/llvoavatar.h | |
| parent | 4bd450737bf1f5a74a4857932235d7bcbead1388 (diff) | |
| parent | 67fb58847981f69cb31c34d7141165ba3f49aef6 (diff) | |
merge
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 22fc595ea2..83ca299da1 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -342,7 +342,6 @@ private: **/ public: - U32 renderFootShadows(); U32 renderImpostor(LLColor4U color = LLColor4U(255,255,255,255), S32 diffuse_channel = 0); U32 renderRigid(); U32 renderSkinned(EAvatarRenderPass pass); @@ -579,7 +578,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; |