diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-08-27 16:52:22 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-08-27 16:52:22 +0000 |
| commit | 3fe7577f5ba15477ef65637ca159e5ff92dcbade (patch) | |
| tree | 6bdf032f23906235b6c7d85554e193d5b7c56165 /indra/newview/llviewerobject.h | |
| parent | f79fc96d08e37f119653f7db5a299a05454ff79c (diff) | |
| parent | 2cd01c8e92e2ecf4402a3a075ec8bdc6a8f20470 (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #486)
Default
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 8b1535851e..873b300489 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -588,6 +588,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); |