diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-03-02 02:25:59 -0800 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-03-02 02:25:59 -0800 |
| commit | 8f64a9edea9d4230cdc845c126955e23990823cb (patch) | |
| tree | 8b8554c288f5ce826c30fff4e8c387cb93ad16fe /indra/newview/llviewerobject.h | |
| parent | 92bd48fd6db7c906b5c6a140875219e662939e57 (diff) | |
[MAINT 8081] - show/hide avatar base mesh regions if avatar joint attachments are using server bakes. pass the magic ids correctly across ui and texture entry.
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index bac96991fa..b63a7ab910 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -566,10 +566,9 @@ public: friend class LLViewerObjectList; friend class LLViewerMediaList; -private: +public: LLViewerTexture* getBakedTextureForMagicId(const LLUUID& id); - LLTextureEntry* getBakedTextureEntryForMagicId(const LLUUID& id); - + public: static void unpackVector3(LLDataPackerBinaryBuffer* dp, LLVector3& value, std::string name); static void unpackUUID(LLDataPackerBinaryBuffer* dp, LLUUID& value, std::string name); |