Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 51d3586..e9c33eb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -394,7 +394,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         private string m_creatorData = string.Empty;
         /// <summary>
-        /// Data about the creator in the form profile_url;name
+        /// Data about the creator in the form home_url;name
         /// </summary>
         public string CreatorData 
         {
@@ -405,7 +405,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Used by the DB layer to retrieve / store the entire user identification.
         /// The identification can either be a simple UUID or a string of the form
-        /// uuid[;profile_url[;name]]
+        /// uuid[;home_url[;name]]
         /// </summary>
         public string CreatorIdentification
         {
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 38d1231..7c60ddd 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1134,12 +1134,12 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
             if (sop.CreatorData != null && sop.CreatorData != string.Empty)
                 writer.WriteElementString("CreatorData", sop.CreatorData);
-            else if (options.ContainsKey("profile"))
+            else if (options.ContainsKey("home"))
             {
                 if (m_UserManagement == null)
                     m_UserManagement = sop.ParentGroup.Scene.RequestModuleInterface<IUserManagement>();
                 string name = m_UserManagement.GetUserName(sop.CreatorID);
-                writer.WriteElementString("CreatorData", (string)options["profile"] + "/" + sop.CreatorID + ";" + name);
+                writer.WriteElementString("CreatorData", (string)options["home"] + ";" + name);
             }
 
             WriteUUID(writer, "FolderID", sop.FolderID, options);
@@ -1282,12 +1282,12 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
                     if (item.CreatorData != null && item.CreatorData != string.Empty)
                         writer.WriteElementString("CreatorData", item.CreatorData);
-                    else if (options.ContainsKey("profile"))
+                    else if (options.ContainsKey("home"))
                     {
                         if (m_UserManagement == null)
                             m_UserManagement = scene.RequestModuleInterface<IUserManagement>();
                         string name = m_UserManagement.GetUserName(item.CreatorID);
-                        writer.WriteElementString("CreatorData", (string)options["profile"] + "/" + item.CreatorID + ";" + name);
+                        writer.WriteElementString("CreatorData", (string)options["home"] + ";" + name);
                     }
 
                     writer.WriteElementString("Description", item.Description);