summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-03-21 19:36:11 +0000
committerJosh Bell <josh@lindenlab.com>2007-03-21 19:36:11 +0000
commitc93c38e047836e31dd34e33391a997d883777ae1 (patch)
treeccb52c02f9a3bfeb76254e128abc250e7fd5a962 /indra/llinventory
parentfceae96eb171be0396512e251aab311d4e3ef9cc (diff)
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llinventory.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index e19604c9f0..95d9ae1288 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -195,6 +195,10 @@ public:
II_FLAGS_OBJECT_PERM_OVERWRITE_EVERYONE = 0x080000,
II_FLAGS_OBJECT_PERM_OVERWRITE_NEXT_OWNER = 0x100000,
+ // flag to indicate whether an object that is returned is composed
+ // 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
};