diff options
author | Justin Clark-Casey (justincc) | 2012-01-12 19:03:26 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-01-12 19:03:26 +0000 |
commit | 0a1d61950b326abffbcc0b9fe763e1cc6351acf6 (patch) | |
tree | 934c0e80e5103c871fdf19f90ee50e0175d14895 /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |
parent | refactor: Move existing npc owner checks to NPCModule.CheckPermissions() meth... (diff) | |
parent | Renamed one var and deleted commented code. No functional changes. (diff) | |
download | opensim-SC_OLD-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.zip opensim-SC_OLD-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.gz opensim-SC_OLD-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.bz2 opensim-SC_OLD-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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 | |||
1134 | 1134 | ||
1135 | if (sop.CreatorData != null && sop.CreatorData != string.Empty) | 1135 | if (sop.CreatorData != null && sop.CreatorData != string.Empty) |
1136 | writer.WriteElementString("CreatorData", sop.CreatorData); | 1136 | writer.WriteElementString("CreatorData", sop.CreatorData); |
1137 | else if (options.ContainsKey("profile")) | 1137 | else if (options.ContainsKey("home")) |
1138 | { | 1138 | { |
1139 | if (m_UserManagement == null) | 1139 | if (m_UserManagement == null) |
1140 | m_UserManagement = sop.ParentGroup.Scene.RequestModuleInterface<IUserManagement>(); | 1140 | m_UserManagement = sop.ParentGroup.Scene.RequestModuleInterface<IUserManagement>(); |
1141 | string name = m_UserManagement.GetUserName(sop.CreatorID); | 1141 | string name = m_UserManagement.GetUserName(sop.CreatorID); |
1142 | writer.WriteElementString("CreatorData", (string)options["profile"] + "/" + sop.CreatorID + ";" + name); | 1142 | writer.WriteElementString("CreatorData", (string)options["home"] + ";" + name); |
1143 | } | 1143 | } |
1144 | 1144 | ||
1145 | WriteUUID(writer, "FolderID", sop.FolderID, options); | 1145 | WriteUUID(writer, "FolderID", sop.FolderID, options); |
@@ -1282,12 +1282,12 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1282 | 1282 | ||
1283 | if (item.CreatorData != null && item.CreatorData != string.Empty) | 1283 | if (item.CreatorData != null && item.CreatorData != string.Empty) |
1284 | writer.WriteElementString("CreatorData", item.CreatorData); | 1284 | writer.WriteElementString("CreatorData", item.CreatorData); |
1285 | else if (options.ContainsKey("profile")) | 1285 | else if (options.ContainsKey("home")) |
1286 | { | 1286 | { |
1287 | if (m_UserManagement == null) | 1287 | if (m_UserManagement == null) |
1288 | m_UserManagement = scene.RequestModuleInterface<IUserManagement>(); | 1288 | m_UserManagement = scene.RequestModuleInterface<IUserManagement>(); |
1289 | string name = m_UserManagement.GetUserName(item.CreatorID); | 1289 | string name = m_UserManagement.GetUserName(item.CreatorID); |
1290 | writer.WriteElementString("CreatorData", (string)options["profile"] + "/" + item.CreatorID + ";" + name); | 1290 | writer.WriteElementString("CreatorData", (string)options["home"] + ";" + name); |
1291 | } | 1291 | } |
1292 | 1292 | ||
1293 | writer.WriteElementString("Description", item.Description); | 1293 | writer.WriteElementString("Description", item.Description); |