summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2021-11-16 11:44:55 -0700
committerDave Houlton <euclid@lindenlab.com>2021-11-16 11:44:55 -0700
commit353329c2c2e9e8fa1ff273de2016c9e155585f45 (patch)
treef5098b9532f6d7b757b9a8fb345e7aa5e7e69108 /scripts
parente95b7efd0b4469ce18bce3bc0261ecc9be06ea9c (diff)
parent9957c28ddc5e5c129af2db662da7d69f1509af65 (diff)
DRTVWR-546 merge in master v6.5.1
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/messages/message_template.msg10
-rwxr-xr-xscripts/messages/message_template.msg.sha12
-rwxr-xr-xscripts/template_verifier.py2
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',