From 89945f8829dcc1ee889aad1bafd1d6c2938a6cc7 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Thu, 31 Oct 2013 13:02:57 +0200
Subject: Refactored: ExternalRepresentationUtils should be the only place
 where the "CreatorData" field is calculated, to ensure uniformity

Resolves http://opensimulator.org/mantis/view.php?id=6933
---
 .../External/ExternalRepresentationUtils.cs              | 16 +++++++++++++---
 .../External/UserInventoryItemSerializer.cs              |  3 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Framework/Serialization/External')

diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index c56f213..db46ea8 100644
--- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
+++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -161,7 +161,7 @@ namespace OpenSim.Framework.Serialization.External
                 if (!hasCreatorData && creator != null)
                 {
                     XmlElement creatorData = doc.CreateElement("CreatorData");
-                    creatorData.InnerText = homeURL + ";" + creator.FirstName + " " + creator.LastName;
+                    creatorData.InnerText = CalcCreatorData(homeURL, creator.FirstName + " " + creator.LastName);
                     sop.AppendChild(creatorData);
                 }
             }
@@ -172,5 +172,15 @@ namespace OpenSim.Framework.Serialization.External
                 return wr.ToString();
             }
         }
+
+        public static string CalcCreatorData(string homeURL, string name)
+        {
+            return homeURL + ";" + name;
+        }
+
+        internal static string CalcCreatorData(string homeURL, UUID uuid, string name)
+        {
+            return homeURL + "/" + uuid + ";" + name;
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index f2a6b8b..135cefb 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -286,7 +286,8 @@ namespace OpenSim.Framework.Serialization.External
                     UserAccount account = userAccountService.GetUserAccount(UUID.Zero, inventoryItem.CreatorIdAsUuid);
                     if (account != null)
                     {
-                        writer.WriteElementString("CreatorData", (string)options["home"] + "/" + inventoryItem.CreatorIdAsUuid + ";" + account.FirstName + " " + account.LastName);
+                        string creatorData = ExternalRepresentationUtils.CalcCreatorData((string)options["home"], inventoryItem.CreatorIdAsUuid, account.FirstName + " " + account.LastName);
+                        writer.WriteElementString("CreatorData", creatorData);
                     }
                     writer.WriteElementString("CreatorID", inventoryItem.CreatorId);
                 }
-- 
cgit v1.1