diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-08-26 13:36:43 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-08-26 13:36:43 -0700 |
| commit | cddce7bbb8975c27d561e9868e8a28f48e2a5208 (patch) | |
| tree | 1563f6857ae47a53d83940fc2f1457564267b3de /indra/newview/llvoavatar.h | |
| parent | ed7fda069bcbf145a273b46cb2070c72d059acef (diff) | |
| parent | 5986bf4826d04027a17a098d1b80064aabde5a7b (diff) | |
Merge viewer-release 6.3.1
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index b603381e6d..00dccc5d12 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -617,6 +617,7 @@ public: public: /*virtual*/ LLTexLayerSet* createTexLayerSet(); // Return LLViewerTexLayerSet void releaseComponentTextures(); // ! BACKWARDS COMPATIBILITY ! + protected: static void onBakedTextureMasksLoaded(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata); static void onInitialBakedTextureLoaded(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata); @@ -701,6 +702,9 @@ public: void updateSexDependentLayerSets(); virtual void dirtyMesh(); // Dirty the avatar mesh void updateMeshData(); + void updateMeshVisibility(); + LLViewerTexture* getBakedTexture(const U8 te); + protected: void releaseMeshData(); virtual void restoreMeshData(); |