Subject: svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26

From: Robert Knop <[email-masked]>
Date: Tue, 19 May 2009 17:16:44 +0000

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/messages/message_template.msg')

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