diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-11-14 18:22:39 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-11-14 18:22:39 +0000 |
| commit | 18eb4b497fd890118e7da78dcc2eda4bd84c4ede (patch) | |
| tree | f894e7e1b86650ff5a7ff6366f2869b84adbd773 /indra/llinventory | |
| parent | 045ddf0b02b3cbe5e5c9575eef63112ad12ddb12 (diff) | |
| parent | dd6167ae8d652e32d1c3849631dd8c0022032f79 (diff) | |
Merged in maxim_productengine/viewer-eep (pull request #190)
SL-10061 FIXED [EEP] Parcel Environment settings can't be changed when Region settings are used
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llparcel.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index 9ece9b58e5..067391b5a1 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -102,7 +102,9 @@ 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; + +// if Region settings are used, parcel env. version is -1 +const S32 INVALID_PARCEL_ENVIRONMENT_VERSION = -2; // Timeouts for parcels // default is 21 days * 24h/d * 60m/h * 60s/m *1000000 usec/s = 1814400000000 |