diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-02-28 22:14:38 -0800 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-02-28 22:14:38 -0800 |
| commit | bfbcd6d16931819c43eea8e83963c9f86c6892dd (patch) | |
| tree | 618356592c438411504c3789f32608ee40e56c79 /indra/newview/llviewerobject.h | |
| parent | d4ce47b09122d1f76601ba402c2b9ad6bb504950 (diff) | |
[MAINT-8081] - bakes on mesh. 1st pass. changed texture panel to select bakes on objects. handle magic bake ids in LLViewerObject.
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 7a490f6957..bac96991fa 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -566,6 +566,10 @@ public: friend class LLViewerObjectList; friend class LLViewerMediaList; +private: + 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); |