diff options
author | Justin Clarke Casey | 2009-04-08 17:50:57 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-08 17:50:57 +0000 |
commit | f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856 (patch) | |
tree | cdcef4e023e1adf8bb4a83e5ebe81448dbf33c6b /OpenSim/Grid/AssetInventoryServer | |
parent | * Fix the remainder of the packets that require sessionId checks. (diff) | |
download | opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.zip opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.gz opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.bz2 opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.xz |
* Make it possible to store creator strings in user inventory items as well as UUIDs
* All existing functionality should be unaffected.
* Database schemas have not been changed.
Diffstat (limited to '')
3 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs index 06b0220..e19160a 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs | |||
@@ -216,7 +216,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins | |||
216 | writer.WriteString(item.InvType.ToString()); | 216 | writer.WriteString(item.InvType.ToString()); |
217 | writer.WriteEndElement(); | 217 | writer.WriteEndElement(); |
218 | writer.WriteStartElement("CreatorUUID"); | 218 | writer.WriteStartElement("CreatorUUID"); |
219 | writer.WriteString(item.Creator.ToString()); | 219 | writer.WriteString(item.CreatorId); |
220 | writer.WriteEndElement(); | 220 | writer.WriteEndElement(); |
221 | writer.WriteStartElement("CreationDate"); | 221 | writer.WriteStartElement("CreationDate"); |
222 | writer.WriteString(item.CreationDate.ToString()); | 222 | writer.WriteString(item.CreationDate.ToString()); |
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs index c226a26..a905473 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs | |||
@@ -598,7 +598,6 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim | |||
598 | { | 598 | { |
599 | InventoryItemBase item = new InventoryItemBase(); | 599 | InventoryItemBase item = new InventoryItemBase(); |
600 | 600 | ||
601 | |||
602 | try | 601 | try |
603 | { | 602 | { |
604 | using (XmlReader reader = XmlReader.Create(stream)) | 603 | using (XmlReader reader = XmlReader.Create(stream)) |
@@ -624,9 +623,8 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim | |||
624 | 623 | ||
625 | ReadUUID(reader, "Folder", out dummyUUID); | 624 | ReadUUID(reader, "Folder", out dummyUUID); |
626 | item.Folder = dummyUUID; | 625 | item.Folder = dummyUUID; |
627 | ReadUUID(reader, "Creator", out dummyUUID); | ||
628 | item.Creator = dummyUUID; | ||
629 | 626 | ||
627 | item.CreatorId = reader.ReadElementContentAsString("Creator", String.Empty); | ||
630 | item.Description = reader.ReadElementContentAsString("Description", String.Empty); | 628 | item.Description = reader.ReadElementContentAsString("Description", String.Empty); |
631 | 629 | ||
632 | uint dummyUInt; | 630 | uint dummyUInt; |
@@ -757,7 +755,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim | |||
757 | writer.WriteElementString("InvType", XmlConvert.ToString(item.InvType)); | 755 | writer.WriteElementString("InvType", XmlConvert.ToString(item.InvType)); |
758 | WriteUUID(writer, "Folder", item.Folder); | 756 | WriteUUID(writer, "Folder", item.Folder); |
759 | WriteUUID(writer, "Owner", item.Owner); | 757 | WriteUUID(writer, "Owner", item.Owner); |
760 | WriteUUID(writer, "Creator", item.Creator); | 758 | writer.WriteElementString("Creator", item.CreatorId); |
761 | writer.WriteElementString("Name", item.Name); | 759 | writer.WriteElementString("Name", item.Name); |
762 | writer.WriteElementString("Description", item.Description); | 760 | writer.WriteElementString("Description", item.Description); |
763 | writer.WriteElementString("NextPermissions", XmlConvert.ToString(item.NextPermissions)); | 761 | writer.WriteElementString("NextPermissions", XmlConvert.ToString(item.NextPermissions)); |
diff --git a/OpenSim/Grid/AssetInventoryServer/Utils.cs b/OpenSim/Grid/AssetInventoryServer/Utils.cs index 58b0c67..c79a426 100644 --- a/OpenSim/Grid/AssetInventoryServer/Utils.cs +++ b/OpenSim/Grid/AssetInventoryServer/Utils.cs | |||
@@ -515,7 +515,7 @@ namespace OpenSim.Grid.AssetInventoryServer | |||
515 | else if (Reader.LocalName == "Creator" && Reader.NamespaceURI == "" && !b13) | 515 | else if (Reader.LocalName == "Creator" && Reader.NamespaceURI == "" && !b13) |
516 | { | 516 | { |
517 | b13 = true; | 517 | b13 = true; |
518 | ob.@Creator = ReadObject_UUID(false, true); | 518 | ob.@CreatorId = Reader.ReadElementString(); |
519 | } | 519 | } |
520 | else if (Reader.LocalName == "Owner" && Reader.NamespaceURI == "" && !b12) | 520 | else if (Reader.LocalName == "Owner" && Reader.NamespaceURI == "" && !b12) |
521 | { | 521 | { |
@@ -876,7 +876,7 @@ namespace OpenSim.Grid.AssetInventoryServer | |||
876 | WriteElementString("InvType", "", ob.@InvType.ToString(CultureInfo.InvariantCulture)); | 876 | WriteElementString("InvType", "", ob.@InvType.ToString(CultureInfo.InvariantCulture)); |
877 | WriteObject_UUID(ob.@Folder, "Folder", "", false, false, true); | 877 | WriteObject_UUID(ob.@Folder, "Folder", "", false, false, true); |
878 | WriteObject_UUID(ob.@Owner, "Owner", "", false, false, true); | 878 | WriteObject_UUID(ob.@Owner, "Owner", "", false, false, true); |
879 | WriteObject_UUID(ob.@Creator, "Creator", "", false, false, true); | 879 | WriteElementString("Creator", "", ob.@CreatorId); |
880 | WriteElementString("Name", "", ob.@Name); | 880 | WriteElementString("Name", "", ob.@Name); |
881 | WriteElementString("Description", "", ob.@Description); | 881 | WriteElementString("Description", "", ob.@Description); |
882 | WriteElementString("NextPermissions", "", ob.@NextPermissions.ToString(CultureInfo.InvariantCulture)); | 882 | WriteElementString("NextPermissions", "", ob.@NextPermissions.ToString(CultureInfo.InvariantCulture)); |