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: [PATCH] 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
---
indra/llmessage/lltransfersourceasset.cpp | 1 -
scripts/messages/message_template.msg | 9 +++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/indra/llmessage/lltransfersourceasset.cpp b/indra/llmessage/lltransfersourceasset.cpp
index 5a1cd95ffcd..41f3f3f607d 100644
--- a/indra/llmessage/lltransfersourceasset.cpp
+++ b/indra/llmessage/lltransfersourceasset.cpp
@@ -270,7 +270,6 @@ bool is_asset_fetch_by_id_allowed(LLAssetType::EType type)
case LLAssetType::AT_BODYPART:
case LLAssetType::AT_ANIMATION:
case LLAssetType::AT_GESTURE:
- case LLAssetType::AT_FAVORITE:
rv = true;
break;
default:
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 9deab1f8576..e1b01c569b7 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 }
+
}
}
--
GitLab