diff options
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llinventory.h | 10 | ||||
| -rw-r--r-- | indra/llinventory/llparcel.cpp | 5 |
2 files changed, 14 insertions, 1 deletions
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 53a52cd324..d34046c310 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -200,6 +200,16 @@ public: // EWearableType enumeration found in newview/llwearable.h // II_FLAGS_WEARABLES_MASK = 0xff, + + // these bits need to be cleared whenever the asset_id is updated + // on a pre-existing inventory item (DEV-28098 and DEV-30997) + II_FLAGS_PERM_OVERWRITE_MASK = II_FLAGS_OBJECT_SLAM_PERM + | II_FLAGS_OBJECT_SLAM_SALE + | II_FLAGS_OBJECT_PERM_OVERWRITE_BASE + | II_FLAGS_OBJECT_PERM_OVERWRITE_OWNER + | II_FLAGS_OBJECT_PERM_OVERWRITE_GROUP + | II_FLAGS_OBJECT_PERM_OVERWRITE_EVERYONE + | II_FLAGS_OBJECT_PERM_OVERWRITE_NEXT_OWNER, }; protected: diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 2689ada80c..9c27476b0a 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -58,8 +58,11 @@ static const std::string PARCEL_OWNERSHIP_STATUS_STRING[LLParcel::OS_COUNT+1] = }; // NOTE: Adding parcel categories also requires updating: -// * newview/app_settings/floater_directory.xml category combobox +// * floater_directory.xml category combobox +// * floater_about_land.xml category combobox // * Web site "create event" tools +// DO NOT DELETE ITEMS FROM THIS LIST WITHOUT DEEPLY UNDERSTANDING WHAT YOU'RE DOING. +// static const std::string PARCEL_CATEGORY_STRING[LLParcel::C_COUNT] = { "none", |