summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2007-12-06 18:18:35 +0000
committerDon Kjer <don@lindenlab.com>2007-12-06 18:18:35 +0000
commit9754d265eb70a0e137cce1562df8d59dd74093af (patch)
treea2c13c9955fbb1d72fd1ba45a426ba927b1f6737 /scripts
parentfacf67ae3226105910c983a8fa8760414bf703e9 (diff)
EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/FixGroupVotes into release
ACTUAL MERGE: svn merge -r 75163:75166 svn+ssh://svn/svn/linden/qa/FixGroupVotes-merge-75160 into release
Diffstat (limited to 'scripts')
-rw-r--r--scripts/messages/message_template.msg4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 938a30ae53..c7ce013dcd 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -7708,7 +7708,7 @@ version 2.0
// viewer -> simulator -> dataserver
// reliable
{
- StartGroupProposal Low 363 NotTrusted Zerocoded
+ StartGroupProposal Low 363 NotTrusted Zerocoded UDPDeprecated
{
AgentData Single
{ AgentID LLUUID }
@@ -7728,7 +7728,7 @@ version 2.0
// viewer -> simulator -> dataserver
// reliable
{
- GroupProposalBallot Low 364 NotTrusted Unencoded
+ GroupProposalBallot Low 364 NotTrusted Unencoded UDPDeprecated
{
AgentData Single
{ AgentID LLUUID }