diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-10-16 21:41:31 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-10-16 21:41:31 +0000 |
| commit | 89d92267e233bc34fe600a07f485266e7edb2879 (patch) | |
| tree | 6b70df4f746b15024f3956c0dc9cb5fa5233f606 /indra/newview/llviewerobject.h | |
| parent | fbddb3163824d44cfb2ceee7127ac9ed2874acab (diff) | |
svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-32867 : Avatar Pipeline Project - Multi-Attachments
This is a viewer-side-only, infrastructure-only merge for multi-attachments. This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly.
Reviewed by: Vir.
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index bec36f9da7..b8ae31118c 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -676,6 +676,12 @@ protected: private: static S32 sNumObjects; + +public: + const LLUUID &getItemID() const { return mAttachmentItemID; } + void setItemID(const LLUUID &id) { mAttachmentItemID = id; } +private: + LLUUID mAttachmentItemID; // ItemID when item is in user inventory. }; /////////////////// |