aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorOren Hurvitz2013-10-31 13:02:57 +0200
committerOren Hurvitz2014-03-24 18:00:59 +0100
commit89945f8829dcc1ee889aad1bafd1d6c2938a6cc7 (patch)
tree2669a438a473f6b58fd59b10a635662709435bac /OpenSim/Region/Framework
parentWhen updating the CreatorId of an inventory item, automatically update the Cr... (diff)
downloadopensim-SC_OLD-89945f8829dcc1ee889aad1bafd1d6c2938a6cc7.zip
opensim-SC_OLD-89945f8829dcc1ee889aad1bafd1d6c2938a6cc7.tar.gz
opensim-SC_OLD-89945f8829dcc1ee889aad1bafd1d6c2938a6cc7.tar.bz2
opensim-SC_OLD-89945f8829dcc1ee889aad1bafd1d6c2938a6cc7.tar.xz
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
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index f07dee9..4deca00 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1230,7 +1230,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1230 if (m_UserManagement == null) 1230 if (m_UserManagement == null)
1231 m_UserManagement = sop.ParentGroup.Scene.RequestModuleInterface<IUserManagement>(); 1231 m_UserManagement = sop.ParentGroup.Scene.RequestModuleInterface<IUserManagement>();
1232 string name = m_UserManagement.GetUserName(sop.CreatorID); 1232 string name = m_UserManagement.GetUserName(sop.CreatorID);
1233 writer.WriteElementString("CreatorData", (string)options["home"] + ";" + name); 1233 writer.WriteElementString("CreatorData", ExternalRepresentationUtils.CalcCreatorData((string)options["home"], name));
1234 } 1234 }
1235 1235
1236 WriteUUID(writer, "FolderID", sop.FolderID, options); 1236 WriteUUID(writer, "FolderID", sop.FolderID, options);
@@ -1403,7 +1403,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1403 if (m_UserManagement == null) 1403 if (m_UserManagement == null)
1404 m_UserManagement = scene.RequestModuleInterface<IUserManagement>(); 1404 m_UserManagement = scene.RequestModuleInterface<IUserManagement>();
1405 string name = m_UserManagement.GetUserName(item.CreatorID); 1405 string name = m_UserManagement.GetUserName(item.CreatorID);
1406 writer.WriteElementString("CreatorData", (string)options["home"] + ";" + name); 1406 writer.WriteElementString("CreatorData", ExternalRepresentationUtils.CalcCreatorData((string)options["home"], name));
1407 } 1407 }
1408 1408
1409 writer.WriteElementString("Description", item.Description); 1409 writer.WriteElementString("Description", item.Description);