diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-08-26 12:35:18 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-08-26 12:35:18 -0700 |
| commit | 723f1891db513acf36e0d20bdd93a615c31a5337 (patch) | |
| tree | f1d3edca4e3bc5dfb68964c9b201c41b728eff33 /indra/newview/llviewerobject.h | |
| parent | 00eddaf23fbe6761e6a78500b42d076f7a1551fa (diff) | |
| parent | 5986bf4826d04027a17a098d1b80064aabde5a7b (diff) | |
Merge 6.3.1 viewer-release
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); |