Merge branch 'develop' of https://github.com/secondlife/viewer

# Conflicts: # scripts/messages/message_template.msg # scripts/messages/message_template.msg.sha1
2025-03-19 15:00:25 +01:00 · 2025-03-19 15:00:25 +01:00 · 36a8432909
parent 8cba447d68 f462037b8e
commit 36a8432909
2 changed files with 6256 additions and 6187 deletions
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@ -1 +1 @@
-91e9b6acccc03f06506d3bc0d014ab05ef71eec1
+f0e9d30b03fe7823a7050cf1a86653e4de4bc256
		`@ -1 +1 @@`
			`91e9b6acccc03f06506d3bc0d014ab05ef71eec1`				`f0e9d30b03fe7823a7050cf1a86653e4de4bc256`