diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-04-19 23:39:19 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-04-19 23:39:19 -0500 |
| commit | e275b7a658ee29ca4ce3dd77908ddd4c34749449 (patch) | |
| tree | f5b2f701c9856db6b0dfb13ae4d6a40eaae9b46e /indra/newview/llvoavatar.h | |
| parent | 1f3e0ae090f04929296e94dc3a3128ab3ac73247 (diff) | |
| parent | e994b9dcee82b510dc881e2b14d053a27fe35472 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 3bafa8bcda..411ebe4121 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); @@ -566,13 +565,13 @@ private: public: void updateMeshTextures(); void updateSexDependentLayerSets(BOOL upload_bake); - void dirtyMesh(); // Dirty the avatar mesh + void dirtyMesh(S32 priority = 1); // Dirty the avatar mesh void updateMeshData(); protected: void releaseMeshData(); virtual void restoreMeshData(); private: - BOOL mDirtyMesh; + S32 mDirtyMesh; // 0 -- not dirty, 1 -- morphed, 2 -- LOD BOOL mMeshTexturesDirty; typedef std::multimap<std::string, LLPolyMesh*> polymesh_map_t; |