diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-11-13 09:25:32 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-11-13 09:25:32 -0800 |
| commit | 4662ba8a2693780198d555a49a00cfafba838d41 (patch) | |
| tree | 8695606e3038ee5e5d31f2b7c0c8c1a63fc540d8 /indra/llinventory | |
| parent | a49e2b604e6b505e083e24b10e39053196d917c1 (diff) | |
| parent | bda785e8b1bef35ecd9d45a7092b0ab66c17d1f4 (diff) | |
Merge
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llparcel.cpp | 2 | ||||
| -rw-r--r-- | indra/llinventory/llparcel.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index aff7f86fd4..e2469f3c7e 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -233,7 +233,7 @@ void LLParcel::init(const LLUUID &owner_id, setHaveNewParcelLimitData(FALSE); setRegionAllowEnvironmentOverride(FALSE); - setParcelEnvironmentVersion(-1); + setParcelEnvironmentVersion(INVALID_PARCEL_ENVIRONMENT_VERSION); } void LLParcel::overrideOwner(const LLUUID& owner_id, BOOL is_group_owned) diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index 2497a069d7..9ece9b58e5 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -102,6 +102,7 @@ const U32 RT_LIST = 0x1 << 4; const U32 RT_SELL = 0x1 << 5; const S32 INVALID_PARCEL_ID = -1; +const S32 INVALID_PARCEL_ENVIRONMENT_VERSION = -1; // Timeouts for parcels // default is 21 days * 24h/d * 60m/h * 60s/m *1000000 usec/s = 1814400000000 |