summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-03-24 11:19:47 -0400
committerOz Linden <oz@lindenlab.com>2015-03-24 11:19:47 -0400
commitd06ac0b7ba3ceb912ff8cf04da063eb482050d2b (patch)
treefd4dc5e6d626b67ebe2fb94ceae7e5df03b5d6f8 /scripts
parentdd7f0e2954a80e39eba50b7a06e167a50a248632 (diff)
parentc489f1f8647a77c8c7d5fb5b721433dd72cb49c8 (diff)
merge changes for 3.7.26-release
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/messages/message_template.msg4
-rwxr-xr-xscripts/messages/message_template.msg.sha12
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 6702de9b4a..3cec4ada1c 100755
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -3594,6 +3594,10 @@ version 2.0
{ CofVersion S32 }
{ Flags U32 }
}
+ {
+ AppearanceHover Variable
+ { HoverHeight LLVector3 }
+ }
}
// 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 7a31177f11..e699efb03c 100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1 +1 @@
-4dbf88396c3188ad4c54c4f847a7d8817793668d \ No newline at end of file
+2286adc795b1b06eb86fdda431a71a6f0874b4f1 \ No newline at end of file