From 6df2755ba6b24d0cefd52ce175b0212dd46c9b10 Mon Sep 17 00:00:00 2001 From: Aaron Brashears Date: Mon, 18 May 2009 23:38:35 +0000 Subject: Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462 --- scripts/messages/message_template.msg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index a65b4a3071..f7230cfdf6 100644 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -2720,7 +2720,7 @@ version 2.0 // end viewer to simulator section { - ViewerStats Low 131 NotTrusted Zerocoded + ViewerStats Low 131 NotTrusted Zerocoded UDPDeprecated { AgentData Single { AgentID LLUUID } -- cgit v1.2.3 From 9a8d0699020843ef3e8ee11daac7fd616d752234 Mon Sep 17 00:00:00 2001 From: Robert Knop Date: Tue, 19 May 2009 17:16:44 +0000 Subject: svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merging server-1.26 back to trunk. Two conflicts -- llversionserver.hh (kept the trunk version) and in llsimparcelmgr.cpp -- also kept the trunk version. There was some code in 1.26 that included error printing from RDW that says "we should really not be hitting this code", and that code was gone in trunk... so, went ahead and kept the trunk part of that one conflict in that file. --- scripts/messages/message_template.msg | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'scripts') diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index f7230cfdf6..23efd65c45 100644 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -4911,6 +4911,12 @@ version 2.0 { ActualArea S32 } { Final BOOL } // true if buyer should be in tier } + { + RegionData Single // included so region name shows up in transaction logs + { RegionID LLUUID } + { GridX U32 } + { GridY U32 } + } } // sim ->dataserver -- cgit v1.2.3