diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index 21ad4ab..61f3fbe 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |||
@@ -612,6 +612,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
612 | { "Name", item.Name }, | 612 | { "Name", item.Name }, |
613 | { "Description", item.Description }, | 613 | { "Description", item.Description }, |
614 | { "CreatorID", item.CreatorId }, | 614 | { "CreatorID", item.CreatorId }, |
615 | { "CreatorData", item.CreatorData }, | ||
615 | { "ContentType", invContentType }, | 616 | { "ContentType", invContentType }, |
616 | { "ExtraData", OSDParser.SerializeJsonString(extraData) } | 617 | { "ExtraData", OSDParser.SerializeJsonString(extraData) } |
617 | }; | 618 | }; |
@@ -776,6 +777,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
776 | invItem.AssetType = SLUtil.ContentTypeToSLAssetType(item["ContentType"].AsString()); | 777 | invItem.AssetType = SLUtil.ContentTypeToSLAssetType(item["ContentType"].AsString()); |
777 | invItem.CreationDate = item["CreationDate"].AsInteger(); | 778 | invItem.CreationDate = item["CreationDate"].AsInteger(); |
778 | invItem.CreatorId = item["CreatorID"].AsString(); | 779 | invItem.CreatorId = item["CreatorID"].AsString(); |
780 | invItem.CreatorData = item["CreatorData"].AsString(); | ||
779 | invItem.CreatorIdAsUuid = item["CreatorID"].AsUUID(); | 781 | invItem.CreatorIdAsUuid = item["CreatorID"].AsUUID(); |
780 | invItem.Description = item["Description"].AsString(); | 782 | invItem.Description = item["Description"].AsString(); |
781 | invItem.Folder = item["ParentID"].AsUUID(); | 783 | invItem.Folder = item["ParentID"].AsUUID(); |