diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-12-04 11:15:47 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-12-04 11:15:47 +0000 |
| commit | 4b439ff968a934c127cd685b54bcc206e467a948 (patch) | |
| tree | e23e4f9044d844d02c59b4b3d5016c130e0000ca /indra/newview/llviewerobject.h | |
| parent | 0d2d6b42baa4fc6d253c5499324ffe5572676d87 (diff) | |
SL-704 - made avatar hierarchy more consistent by adding lluiavatar for viewer-local avs used in upload previews
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 0bfc513dc9..4a2ccd4e3a 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -706,6 +706,10 @@ public: virtual bool isAnimatedObject() const; + // Flags for createObject + static const S32 CO_FLAG_CONTROL_AVATAR = 1 << 0; + static const S32 CO_FLAG_UI_AVATAR = 1 << 1; + protected: LLPointer<LLControlAvatar> mControlAvatar; @@ -719,9 +723,6 @@ protected: // updateInventory. void doUpdateInventory(LLPointer<LLViewerInventoryItem>& item, U8 key, bool is_new); - // Flags for createObject - static const S32 CO_FLAG_CONTROL_AVATAR = 1 << 1; - static LLViewerObject *createObject(const LLUUID &id, LLPCode pcode, LLViewerRegion *regionp, S32 flags = 0); BOOL setData(const U8 *datap, const U32 data_size); |