diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 13:41:19 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 13:41:19 +0100 |
commit | 9fd6531dda19bda12ba7dc16a5b5020550711a97 (patch) | |
tree | 5967fefa044c3a7b5c52ae5cb40e38395639a8be /indra/newview/llvoavatar.h | |
parent | e9da44aa093305de76417e62319119e7e478c726 (diff) |
Try to fix a (correct) gcc whine about the child hiding the parent's dirtyMesh() method.
What I can't figure out is why gcc doesn't complain in render-pipeline, where the problem is the same.
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r-- | indra/newview/llvoavatar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 445bb03274..0b0ef26970 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -564,12 +564,13 @@ private: public: void updateMeshTextures(); void updateSexDependentLayerSets(BOOL upload_bake); - void dirtyMesh(S32 priority = 1); // Dirty the avatar mesh + void dirtyMesh(); // Dirty the avatar mesh void updateMeshData(); protected: void releaseMeshData(); virtual void restoreMeshData(); private: + void dirtyMesh(S32 priority); // Dirty the avatar mesh, with priority S32 mDirtyMesh; // 0 -- not dirty, 1 -- morphed, 2 -- LOD BOOL mMeshTexturesDirty; |