Merge

2 files changed, 25 insertions, 3 deletions

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 01397181e4..ed32804bef 100755
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -8,7 +8,7 @@ version 2.0
 // for each type is listed below:
 // Low: 423
 // Medium: 18
-// High: 29
+// High: 30
 // PLEASE UPDATE THIS WHEN YOU ADD A NEW MESSAGE!
 
 
@@ -3571,7 +3571,6 @@ version 2.0
 	}
 
 }
-
 // AvatarAppearance - Update visual params
 {
 	AvatarAppearance Low 158 Trusted Zerocoded
@@ -7291,6 +7290,29 @@ version 2.0
 
 
 // *************************************************************************
+// Object animation messages
+// *************************************************************************
+
+// Note this is basically identical to AvatarAnimation.
+// Needs to be a different message because existing viewers
+// have insufficiently smart handler functions.
+
+// ObjectAnimation - Update animation state
+// simulator --> viewer
+{
+        ObjectAnimation High 30 Trusted Unencoded
+        {
+                Sender                  Single
+                {       ID                      LLUUID  }
+        }
+        {
+                AnimationList Variable
+                { AnimID                LLUUID }
+                { AnimSequenceID S32 }
+        }
+}
+
+// *************************************************************************
 // Asset storage messages
 // *************************************************************************
 
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index ae8937f461..db87ad5e77 100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1 +1 @@
-4c5ec7187d1af05b52b5c1bbac68d46fbc65da05
\ No newline at end of file
+55df2c7135733c5da64ef8f01859b83a433a3a09
\ No newline at end of file