diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-05 21:55:56 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-05 21:55:56 +0300 |
| commit | cd895d6e583f42349ca3bc330d82c66740ce08ab (patch) | |
| tree | 4367d6ee2d3d3e9df896ad25501d80446aef32ba /indra/newview/llviewerobject.h | |
| parent | 23acff80c083c442edddbe3fbb1754d640496704 (diff) | |
| parent | 05f1e3e7138c4eca27d4047bd9727a4fba0c9dc0 (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 89cea5756f..e9ae26939a 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -590,6 +590,10 @@ public: friend class LLViewerMediaList; public: + LLViewerTexture* getBakedTextureForMagicId(const LLUUID& id); + void updateAvatarMeshVisibility(const LLUUID& id, const LLUUID& old_id); + void refreshBakeTexture(); +public: static void unpackVector3(LLDataPackerBinaryBuffer* dp, LLVector3& value, std::string name); static void unpackUUID(LLDataPackerBinaryBuffer* dp, LLUUID& value, std::string name); static void unpackU32(LLDataPackerBinaryBuffer* dp, U32& value, std::string name); |