diff options
author | Callum Prentice <callum@gmail.com> | 2017-06-08 15:36:42 -0700 |
---|---|---|
committer | Callum Prentice <callum@gmail.com> | 2017-06-08 15:36:42 -0700 |
commit | 07185d300d7879fc4d8d268210fa2c440efe02f4 (patch) | |
tree | 761fcb3e968339bc04882ea591f56af2fb175187 /scripts | |
parent | 8d36da00c885f31739ce6bf6dbc162a6ef3a15a1 (diff) | |
parent | cf5865c6e2b27918b526431ccc4309bfc702534e (diff) |
Automated merge with head of lindenlab/viewer64
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/messages/message_template.msg | 4 | ||||
-rwxr-xr-x | scripts/messages/message_template.msg.sha1 | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index fbbc385e5b..c56eaae6fe 100755 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -4499,6 +4499,10 @@ version 2.0 AgeVerificationBlock Single { RegionDenyAgeUnverified BOOL } } + { + RegionAllowAccessBlock Single + { RegionAllowAccessOverride BOOL } + } } // ParcelPropertiesUpdate diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1 index 2c6489906c..5bc06ec042 100755 --- a/scripts/messages/message_template.msg.sha1 +++ b/scripts/messages/message_template.msg.sha1 @@ -1 +1 @@ -845459c1bb7fe8174fb493528fe2a214015f996d
\ No newline at end of file +337f351910b0c8821cb3d447bc6578516a043c80
\ No newline at end of file |