diff options
| author | Kent Quirk <q@lindenlab.com> | 2007-11-15 19:10:29 +0000 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2007-11-15 19:10:29 +0000 |
| commit | 138bf17c3c51cbf3826a05887d73c49908025f95 (patch) | |
| tree | d47a36708813b3f93b4049d822f966c48de4e576 /indra/llmessage | |
| parent | c1920e3c1c60fb792cf091750b05de618b355878 (diff) | |
merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llregionflags.h | 8 | ||||
| -rw-r--r-- | indra/llmessage/message_prehash.cpp | 5 | ||||
| -rw-r--r-- | indra/llmessage/message_prehash.h | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/indra/llmessage/llregionflags.h b/indra/llmessage/llregionflags.h index 72272c0df6..5f3fad8b8c 100644 --- a/indra/llmessage/llregionflags.h +++ b/indra/llmessage/llregionflags.h @@ -84,8 +84,8 @@ const U32 REGION_FLAGS_ESTATE_SKIP_SCRIPTS = (1 << 21); const U32 REGION_FLAGS_RESTRICT_PUSHOBJECT = (1 << 22); const U32 REGION_FLAGS_DENY_ANONYMOUS = (1 << 23); -const U32 REGION_FLAGS_DENY_IDENTIFIED = (1 << 24); -const U32 REGION_FLAGS_DENY_TRANSACTED = (1 << 25); +// const U32 REGION_FLAGS_DENY_IDENTIFIED = (1 << 24); +// const U32 REGION_FLAGS_DENY_TRANSACTED = (1 << 25); const U32 REGION_FLAGS_ALLOW_PARCEL_CHANGES = (1 << 26); @@ -94,6 +94,7 @@ const U32 REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER = (1 << 27); const U32 REGION_FLAGS_ALLOW_VOICE = (1 << 28); const U32 REGION_FLAGS_BLOCK_PARCEL_SEARCH = (1 << 29); +const U32 REGION_FLAGS_DENY_AGEUNVERIFIED = (1 << 30); const U32 REGION_FLAGS_DEFAULT = REGION_FLAGS_ALLOW_LANDMARK | @@ -110,8 +111,7 @@ const U32 REGION_FLAGS_ESTATE_MASK = REGION_FLAGS_EXTERNALLY_VISIBLE | REGION_FLAGS_PUBLIC_ALLOWED | REGION_FLAGS_SUN_FIXED | REGION_FLAGS_DENY_ANONYMOUS - | REGION_FLAGS_DENY_IDENTIFIED - | REGION_FLAGS_DENY_TRANSACTED; + | REGION_FLAGS_DENY_AGEUNVERIFIED; inline BOOL is_prelude( U32 flags ) { diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp index 0185c0fea9..0b614d8d90 100644 --- a/indra/llmessage/message_prehash.cpp +++ b/indra/llmessage/message_prehash.cpp @@ -1369,6 +1369,9 @@ char * _PREHASH_AvatarNotesReply; char * _PREHASH_CacheID; char * _PREHASH_OwnerMask; char * _PREHASH_TransferInventoryAck; +char * _PREHASH_RegionDenyAgeUnverified; +char * _PREHASH_AgeVerificationBlock; + void init_prehash_data() { @@ -2702,4 +2705,6 @@ void init_prehash_data() _PREHASH_CacheID = gMessageStringTable.getString("CacheID"); _PREHASH_OwnerMask = gMessageStringTable.getString("OwnerMask"); _PREHASH_TransferInventoryAck = gMessageStringTable.getString("TransferInventoryAck"); + _PREHASH_RegionDenyAgeUnverified = gMessageStringTable.getString("RegionDenyAgeUnverified"); + _PREHASH_AgeVerificationBlock = gMessageStringTable.getString("AgeVerificationBlock"); } diff --git a/indra/llmessage/message_prehash.h b/indra/llmessage/message_prehash.h index 2cea924ff2..4210665a84 100644 --- a/indra/llmessage/message_prehash.h +++ b/indra/llmessage/message_prehash.h @@ -1369,6 +1369,8 @@ extern char * _PREHASH_AvatarNotesReply; extern char * _PREHASH_CacheID; extern char * _PREHASH_OwnerMask; extern char * _PREHASH_TransferInventoryAck; +extern char * _PREHASH_RegionDenyAgeUnverified; +extern char * _PREHASH_AgeVerificationBlock; void init_prehash_data(); |