From ed386ae547c225e352c39e8d14921572ee534b0b Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 18 Jul 2008 17:50:25 +0000 Subject: merge support-featurettes-snapshot-merge-2 for QAR-754, includes: * featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4) * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3) * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771) * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3) Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry * QAR-590 Merge Lock Request for Support Sprint * QAR-627 Merge snapshot improvements * QAR-686 Merge Lock request for Featurettes --- scripts/messages/message_template.msg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/messages') diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index abd25bfb29..7761283239 100644 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -1179,7 +1179,7 @@ version 2.0 // simulator -> viewer // reliable { - ParcelObjectOwnersReply Low 57 Trusted Zerocoded + ParcelObjectOwnersReply Low 57 Trusted Zerocoded UDPDeprecated { Data Variable { OwnerID LLUUID } @@ -8767,7 +8767,7 @@ version 2.0 // LandStatReply // Sent by the simulator in response to LandStatRequest { - LandStatReply Low 422 Trusted Unencoded + LandStatReply Low 422 Trusted Unencoded UDPDeprecated { RequestData Single { ReportType U32 } -- cgit v1.2.3