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')

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