From 053b14a97a43c637c3b11fc2ea332ab7e4196cc2 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 17 Sep 2009 16:53:36 +0000
Subject: Fix error with message template incompatibility for
 LinkInventoryItem.Merging newinventorymsg__merge__viewer-2.0.0-3__r131585
 into viewer-2 trunk, see QAR-1804 and QAR-1805.

Merging revisions 131698-132325 of svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/newinventorymsg__merge__viewer-2.0.0-3__r131585 into D:\viewer-2.0.0-3, respecting ancestry
---
 scripts/messages/message_template.msg | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 67233cbda0..0ddd0dbcdb 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -8946,6 +8946,7 @@ version 2.0
 	}
 }
 
+// Link inventory
 {
 	LinkInventoryItem	Low	426 NotTrusted	Zerocoded
 	{
@@ -8954,12 +8955,15 @@ 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