From 17b9cda4325a035f00e077a6a8e33a8c4f2d5a89 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 24 Jul 2009 00:46:26 +0000
Subject: For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP
 Changes [SIM]"

svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk

This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions.
---
 scripts/messages/message_template.msg | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 23efd65c45..67233cbda0 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -8945,3 +8945,21 @@ version 2.0
 		{	CRC				U32	}
 	}
 }
+
+{
+	LinkInventoryItem	Low	426 NotTrusted	Zerocoded
+	{
+		AgentData		Single
+		{	AgentID		LLUUID	}
+		{	SessionID	LLUUID	}
+	}
+	{
+		InventoryData		Variable
+		{	CallbackID	U32			} // Async Response
+		{	FolderID		LLUUID	}
+		{	OldItemID		LLUUID	}
+		{	Name			Variable	1	}
+		{	AssetType		U8		}
+	}
+}
+
-- 
cgit v1.2.3


From 2c31217cc97938fd4bc482a888410dec59f54ddb Mon Sep 17 00:00:00 2001
From: Dave Simmons <simon@lindenlab.com>
Date: Wed, 29 Jul 2009 17:36:46 +0000
Subject: svn merge -c 128669
 svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-4

Pulled all the sisa changes into trunk for QAR-1734
These changes are the same as revisions 126447:126495 from svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-2
or the one merge branch in
svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-3
---
 scripts/messages/message_template.msg | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 67233cbda0..9deab1f857 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -5288,6 +5288,10 @@ version 2.0
 		{	AgentLegacyAccess		U8	}
 		{	AgentMaxAccess			U8	}
 	}
+	{
+		AgentInfo				Variable
+		{	Flags					U32	}
+	}
 }
 
 // ChildAgentAlive
-- 
cgit v1.2.3


From 74e584add651adbb5784276aba5770de9e295846 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Fri, 4 Sep 2009 18:16:21 +0000
Subject: svn merge -r132607:132665
 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.30
 Propagating to trunk: QAR-1705 DEV-29573 QAR-1859 QAR-1804

---
 scripts/messages/message_template.msg | 9 +++++++--
 1 file changed, 7 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 9deab1f857..e1b01c569b 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -8950,6 +8950,7 @@ version 2.0
 	}
 }
 
+// Link inventory
 {
 	LinkInventoryItem	Low	426 NotTrusted	Zerocoded
 	{
@@ -8958,12 +8959,16 @@ version 2.0
 		{	SessionID	LLUUID	}
 	}
 	{
-		InventoryData		Variable
+		InventoryBlock		Single
 		{	CallbackID	U32			} // Async Response
 		{	FolderID		LLUUID	}
+		{	TransactionID			LLUUID	} // Going to become TransactionID
 		{	OldItemID		LLUUID	}
+		{	Type			S8	}
+		{	InvType			S8	}
 		{	Name			Variable	1	}
-		{	AssetType		U8		}
+		{	Description		Variable	1	}
+
 	}
 }
 
-- 
cgit v1.2.3