diff options
author | Diva Canto | 2010-11-21 17:19:24 -0800 |
---|---|---|
committer | Diva Canto | 2010-11-21 17:19:24 -0800 |
commit | c617d658dda92ad97de678d477a98c3df0659303 (patch) | |
tree | 9a86356af2fcf4ae4eab18b53dc7330bf3e26a86 /OpenSim/Services/Connectors | |
parent | Updated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still u... (diff) | |
download | opensim-SC_OLD-c617d658dda92ad97de678d477a98c3df0659303.zip opensim-SC_OLD-c617d658dda92ad97de678d477a98c3df0659303.tar.gz opensim-SC_OLD-c617d658dda92ad97de678d477a98c3df0659303.tar.bz2 opensim-SC_OLD-c617d658dda92ad97de678d477a98c3df0659303.tar.xz |
Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
New migration in inventory table in order to make CreatorID varchar(255).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | 3 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs index 403ee15..88fbda3 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | |||
@@ -312,6 +312,7 @@ namespace OpenSim.Services.Connectors | |||
312 | { "InvType", item.InvType.ToString() }, | 312 | { "InvType", item.InvType.ToString() }, |
313 | { "Folder", item.Folder.ToString() }, | 313 | { "Folder", item.Folder.ToString() }, |
314 | { "CreatorId", item.CreatorId.ToString() }, | 314 | { "CreatorId", item.CreatorId.ToString() }, |
315 | { "CreatorData", item.CreatorData.ToString() }, | ||
315 | { "Description", item.Description.ToString() }, | 316 | { "Description", item.Description.ToString() }, |
316 | { "NextPermissions", item.NextPermissions.ToString() }, | 317 | { "NextPermissions", item.NextPermissions.ToString() }, |
317 | { "CurrentPermissions", item.CurrentPermissions.ToString() }, | 318 | { "CurrentPermissions", item.CurrentPermissions.ToString() }, |
@@ -344,6 +345,7 @@ namespace OpenSim.Services.Connectors | |||
344 | { "InvType", item.InvType.ToString() }, | 345 | { "InvType", item.InvType.ToString() }, |
345 | { "Folder", item.Folder.ToString() }, | 346 | { "Folder", item.Folder.ToString() }, |
346 | { "CreatorId", item.CreatorId.ToString() }, | 347 | { "CreatorId", item.CreatorId.ToString() }, |
348 | { "CreatorData", item.CreatorData.ToString() }, | ||
347 | { "Description", item.Description.ToString() }, | 349 | { "Description", item.Description.ToString() }, |
348 | { "NextPermissions", item.NextPermissions.ToString() }, | 350 | { "NextPermissions", item.NextPermissions.ToString() }, |
349 | { "CurrentPermissions", item.CurrentPermissions.ToString() }, | 351 | { "CurrentPermissions", item.CurrentPermissions.ToString() }, |
@@ -556,6 +558,7 @@ namespace OpenSim.Services.Connectors | |||
556 | item.InvType = int.Parse(data["InvType"].ToString()); | 558 | item.InvType = int.Parse(data["InvType"].ToString()); |
557 | item.Folder = new UUID(data["Folder"].ToString()); | 559 | item.Folder = new UUID(data["Folder"].ToString()); |
558 | item.CreatorId = data["CreatorId"].ToString(); | 560 | item.CreatorId = data["CreatorId"].ToString(); |
561 | item.CreatorData = data["CreatorData"].ToString(); | ||
559 | item.Description = data["Description"].ToString(); | 562 | item.Description = data["Description"].ToString(); |
560 | item.NextPermissions = uint.Parse(data["NextPermissions"].ToString()); | 563 | item.NextPermissions = uint.Parse(data["NextPermissions"].ToString()); |
561 | item.CurrentPermissions = uint.Parse(data["CurrentPermissions"].ToString()); | 564 | item.CurrentPermissions = uint.Parse(data["CurrentPermissions"].ToString()); |
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(); |