aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs24
1 files changed, 11 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index f5496b9..d901b54 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -123,21 +123,19 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
123 123
124 foreach (string serialisedSceneObject in serialisedSceneObjects) 124 foreach (string serialisedSceneObject in serialisedSceneObjects)
125 { 125 {
126 SceneObjectGroup sceneObject = serialiser.LoadGroupFromXml2(m_scene, serialisedSceneObject); 126 SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
127 127
128 // TODO: Change object creator/owner here 128 // Make the master the owner/creator of everything imported for now
129 129 LLUUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID;
130 if (null != sceneObject) 130 foreach (SceneObjectPart part in sceneObject.Children.Values)
131 { 131 {
132 // Make the master the owner/creator of everything imported for now 132 part.CreatorID = masterAvatarId;
133 LLUUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID; 133 part.OwnerID = masterAvatarId;
134 foreach (SceneObjectPart part in sceneObject.Children.Values) 134 part.LastOwnerID = masterAvatarId;
135 { 135 }
136 part.CreatorID = masterAvatarId; 136
137 part.OwnerID = masterAvatarId; 137 if (m_scene.AddRestoredSceneObject(sceneObject, true, false))
138 part.LastOwnerID = masterAvatarId; 138 {
139 }
140
141 sceneObjects.Add(sceneObject); 139 sceneObjects.Add(sceneObject);
142 } 140 }
143 } 141 }