From 6892fc41f71a00327336dec7158f3ce809ce32a4 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 13 Apr 2010 18:59:05 -0700
Subject: Applying patch from lkalif to add support for inventory links to the
 SimianGrid connectors

---
 .../Connectors/SimianGrid/SimianInventoryServiceConnector.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'OpenSim/Services/Connectors')

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 56e7475..9005e94 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -583,6 +583,14 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "Permissions", permissions }
             };
 
+            // Add different asset type only if it differs from inventory type
+            // (needed for links)
+            string invContentType = SLUtil.SLInvTypeToContentType(item.InvType);
+            string assetContentType = SLUtil.SLAssetTypeToContentType(item.AssetType);
+
+            if (invContentType != assetContentType)
+                extraData["LinkedItemType"] = OSD.FromString(assetContentType);
+
             NameValueCollection requestArgs = new NameValueCollection
             {
                 { "RequestMethod", "AddInventoryItem" },
@@ -593,6 +601,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "Name", item.Name },
                 { "Description", item.Description },
                 { "CreatorID", item.CreatorId },
+                { "ContentType", invContentType },
                 { "ExtraData", OSDParser.SerializeJsonString(extraData) }
             };
 
@@ -781,6 +790,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
                             invItem.GroupPermissions = perms["GroupMask"].AsUInteger();
                             invItem.NextPermissions = perms["NextOwnerMask"].AsUInteger();
                         }
+
+                        if (extraData.ContainsKey("LinkedItemType"))
+                            invItem.AssetType = extraData["LinkedItemType"].AsInteger();
                     }
 
                     if (invItem.BasePermissions == 0)
-- 
cgit v1.1