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 | a0cff3f011cd2c55ab63d5104169953f741a85f0 (patch) | |
| tree | 38249f4dc7d9178053f61821b1fd1d99ffad8951 /indra/newview/llvoavatar.h | |
| parent | f33fff7e15947859f9c89cd5297971a28205bca8 (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.
(transplanted from cba9bf2cf5194da14105cc28e792f908ef672864)
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 b81725f106..a851b7a150 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -565,12 +565,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; |