summaryrefslogtreecommitdiff
path: root/scripts/messages
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/messages')
-rwxr-xr-xscripts/messages/message_template.msg5
-rwxr-xr-xscripts/messages/message_template.msg.sha14
2 files changed, 9 insertions, 0 deletions
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index c019a76793..1450c111c2 100755
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -3607,6 +3607,11 @@ version 2.0
AppearanceHover Variable
{ HoverHeight LLVector3 }
}
+ {
+ AttachmentBlock Variable
+ { ID LLUUID }
+ { AttachmentPoint U8 }
+ }
}
// AvatarSitResponse - response to a request to sit on an object
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index 47291dcd66..941bb8e8c1 100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1 +1,5 @@
+<<<<<<< HEAD
dd15c52581b3fe99e072b26872deba2560893fc4
+=======
+d7915d67467e59287857630bd89bf9529d065199
+>>>>>>> 100ebbab2437de7f5d124a0d7b8279a7a7b57656