diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-02-05 16:43:47 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-02-05 16:43:47 -0500 |
| commit | a4b833f36512658d2aca912a7d58712947ce2f9f (patch) | |
| tree | 888e51bcd35082e95c7adbca198125ea1226b1f3 | |
| parent | 7735ef557d79ee80bb7ee9b36a49735d03a4cc22 (diff) | |
| parent | bd9b56272eb7529b00f861e3ab35b826c73f7ecb (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
| -rw-r--r-- | indra/newview/llvoavatar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index a5815df20a..b5f0ec7176 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -565,7 +565,7 @@ public: void updateMeshData(); protected: void releaseMeshData(); - /*virtual*/ void restoreMeshData(); + virtual void restoreMeshData(); private: BOOL mDirtyMesh; BOOL mMeshTexturesDirty; |