From 1be80e5c5036d6e22071a02521849d61f8ccdbeb Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Wed, 12 Mar 2008 00:15:14 +0000 Subject: svn merge -r 82016:82020 svn+ssh://svn.lindenlab.com/svn/linden/branches/single-ref-attachments-merge --> release QAR-302 Merge single reference attachments work (including cruft deletion) --- indra/llinventory/llinventory.h | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index db4843d8b5..60a0c4158b 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -135,15 +135,40 @@ protected: S32 mCreationDate; // seconds from 1/1/1970, UTC public: + + /** + * Anonymous enumeration for specifying the inventory item flags. + */ enum { - // The meaning of LLInventoryItem::mFlags is distinct for each - // inventory type. + // The shared flags at the top are shared among all inventory + // types. After that section, all values of flags are type + // dependent. The shared flags will start at 2^30 and work + // down while item type specific flags will start at 2^0 and + // work up. II_FLAGS_NONE = 0, - // landmark flags + + // + // Shared flags + // + // + + // This value means that the asset has only one reference in + // the system. If the inventory item is deleted, or the asset + // id updated, then we can remove the old reference. + II_FLAGS_SHARED_SINGLE_REFERENCE = 0x40000000, + + + // + // Landmark flags + // II_FLAGS_LANDMARK_VISITED = 1, + // + // Object flags + // + // flag to indicate that object permissions should have next // owner perm be more restrictive on rez. We bump this into // the second byte of the flags since the low byte is used to @@ -169,8 +194,11 @@ public: // of muiltiple items or not. II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS = 0x200000, + // // wearables use the low order byte of flags to store the // EWearableType enumeration found in newview/llwearable.h + // + II_FLAGS_WEARABLES_MASK = 0xff, }; protected: -- cgit v1.2.3