From f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 8 Apr 2009 17:50:57 +0000
Subject: * 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.

---
 OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs | 2 +-
 .../Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs               | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Grid/AssetInventoryServer/Plugins')

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
             writer.WriteString(item.InvType.ToString());
             writer.WriteEndElement();
             writer.WriteStartElement("CreatorUUID");
-            writer.WriteString(item.Creator.ToString());
+            writer.WriteString(item.CreatorId);
             writer.WriteEndElement();
             writer.WriteStartElement("CreationDate");
             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
         {
             InventoryItemBase item = new InventoryItemBase();
 
-
             try
             {
                 using (XmlReader reader = XmlReader.Create(stream))
@@ -624,9 +623,8 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
 
                     ReadUUID(reader, "Folder", out dummyUUID);
                     item.Folder = dummyUUID;
-                    ReadUUID(reader, "Creator", out dummyUUID);
-                    item.Creator = dummyUUID;
 
+                    item.CreatorId = reader.ReadElementContentAsString("Creator", String.Empty);
                     item.Description = reader.ReadElementContentAsString("Description", String.Empty);
 
                     uint dummyUInt;
@@ -757,7 +755,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
                         writer.WriteElementString("InvType", XmlConvert.ToString(item.InvType));
                         WriteUUID(writer, "Folder", item.Folder);
                         WriteUUID(writer, "Owner", item.Owner);
-                        WriteUUID(writer, "Creator", item.Creator);
+                        writer.WriteElementString("Creator", item.CreatorId);
                         writer.WriteElementString("Name", item.Name);
                         writer.WriteElementString("Description", item.Description);
                         writer.WriteElementString("NextPermissions", XmlConvert.ToString(item.NextPermissions));
-- 
cgit v1.1