diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:21:05 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:21:05 +0200 |
| commit | 0bffd3d365023fea504b1070480e7b2f72080129 (patch) | |
| tree | e11a931c690abe94ca1d7201a9375ea2ed8e1158 /scripts | |
| parent | 3c2ccd879cb59ac0fdcacfab1fe68bc4dcefc68b (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-519
# Conflicts:
# README.md
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/messages/message_template.msg | 10 | ||||
| -rwxr-xr-x | scripts/messages/message_template.msg.sha1 | 2 | ||||
| -rwxr-xr-x | scripts/template_verifier.py | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index 635227ccf3..a3ddc6d336 100755 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -2999,6 +2999,16 @@ version 2.0 RegionInfo3 Variable { RegionFlagsExtended U64 } } + { + RegionInfo5 Variable + { ChatWhisperRange F32 } + { ChatNormalRange F32 } + { ChatShoutRange F32 } + { ChatWhisperOffset F32 } + { ChatNormalOffset F32 } + { ChatShoutOffset F32 } + { ChatFlags U32 } + } } // GodUpdateRegionInfo diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1 index bf45b08f93..4712a03e8d 100755 --- a/scripts/messages/message_template.msg.sha1 +++ b/scripts/messages/message_template.msg.sha1 @@ -1 +1 @@ -be964beb7a2cd060a438c89fd5cb25e2f687d45e
\ No newline at end of file +dddb11f7e45f1779ff536819f36a20e63d572ba8
\ No newline at end of file diff --git a/scripts/template_verifier.py b/scripts/template_verifier.py index b44410cdd8..358931b13e 100755 --- a/scripts/template_verifier.py +++ b/scripts/template_verifier.py @@ -229,7 +229,7 @@ http://wiki.secondlife.com/wiki/Template_verifier.py """) parser.add_option( '-u', '--master_url', type='string', dest='master_url', - default='http://bitbucket.org/lindenlab/master-message-template/raw/tip/message_template.msg', + default='https://bitbucket.org/lindenlab/master-message-template-git/raw/master/message_template.msg', help="""The url of the master message template.""") parser.add_option( '-c', '--cache_master', action='store_true', dest='cache_master', |