Subject: 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

From: Don Kjer <[email-masked]>
Date: Thu, 6 Dec 2007 18:18:35 +0000

---
 scripts/messages/message_template.msg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts/messages/message_template.msg')

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			}
-- 
cgit v1.2.3