diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-03-06 14:58:39 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-03-06 14:58:39 -0800 |
| commit | cbe4cac78cf48cb9144dc2f6c194585cff87a1ce (patch) | |
| tree | 5c1ae3a57ac6bdeafb78bc193ba9b081f8108774 /indra/llinventory/llinventorydefines.h | |
| parent | 5621fa48537100d70e8d06b00b6c2577f5c11140 (diff) | |
Settings type inventory objects and upload the assests.
Diffstat (limited to 'indra/llinventory/llinventorydefines.h')
| -rw-r--r-- | indra/llinventory/llinventorydefines.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/llinventory/llinventorydefines.h b/indra/llinventory/llinventorydefines.h index b420e98ecb..54562673f3 100644 --- a/indra/llinventory/llinventorydefines.h +++ b/indra/llinventory/llinventorydefines.h @@ -81,13 +81,10 @@ public: II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS = 0x200000, // Whether a returned object is composed of multiple items. - II_FLAGS_WEARABLES_MASK = 0xff, - // Wearables use the low order byte of flags to store the - // LLWearableType::EType enumeration found in newview/llwearable.h - // - II_FLAGS_SETTINGS_MASK = 0x0000ff, - // Settings (like wearables) use the low order byte of flags to store - // the settings type + II_FLAGS_SUBTYPE_MASK = 0x0000ff, + // Some items like Wearables and settings use the low order byte + // of flags to store the sub type of the inventory item. + // see LLWearableType::EType enumeration found in newview/llwearable.h II_FLAGS_PERM_OVERWRITE_MASK = (II_FLAGS_OBJECT_SLAM_PERM | II_FLAGS_OBJECT_SLAM_SALE | |