diff options
author | BlueWall | 2011-02-09 14:45:40 -0500 |
---|---|---|
committer | BlueWall | 2011-02-09 14:45:40 -0500 |
commit | 0f736e5601a738b4da435b392774ba211647da9c (patch) | |
tree | edb1f9d90c01841eea86b2ce0b2fbf410dc416ee /OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |
parent | Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff) | |
parent | Flash out the prim count module (diff) | |
download | opensim-SC_OLD-0f736e5601a738b4da435b392774ba211647da9c.zip opensim-SC_OLD-0f736e5601a738b4da435b392774ba211647da9c.tar.gz opensim-SC_OLD-0f736e5601a738b4da435b392774ba211647da9c.tar.bz2 opensim-SC_OLD-0f736e5601a738b4da435b392774ba211647da9c.tar.xz |
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 63 |
1 files changed, 44 insertions, 19 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 3238a81..fd8f546 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -217,22 +217,20 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
217 | m_scene.DeleteAllSceneObjects(); | 217 | m_scene.DeleteAllSceneObjects(); |
218 | } | 218 | } |
219 | 219 | ||
220 | // Try to retain the original creator/owner/lastowner if their uuid is present on this grid | 220 | LoadParcels(serialisedParcels); |
221 | // otherwise, use the master avatar uuid instead | 221 | LoadObjects(serialisedSceneObjects); |
222 | 222 | ||
223 | // Reload serialized parcels | 223 | m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive"); |
224 | m_log.InfoFormat("[ARCHIVER]: Loading {0} parcels. Please wait.", serialisedParcels.Count); | ||
225 | List<LandData> landData = new List<LandData>(); | ||
226 | foreach (string serialisedParcel in serialisedParcels) | ||
227 | { | ||
228 | LandData parcel = LandDataSerializer.Deserialize(serialisedParcel); | ||
229 | if (!ResolveUserUuid(parcel.OwnerID)) | ||
230 | parcel.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
231 | landData.Add(parcel); | ||
232 | } | ||
233 | m_scene.EventManager.TriggerIncomingLandDataFromStorage(landData); | ||
234 | m_log.InfoFormat("[ARCHIVER]: Restored {0} parcels.", landData.Count); | ||
235 | 224 | ||
225 | m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage); | ||
226 | } | ||
227 | |||
228 | /// <summary> | ||
229 | /// Load serialized scene objects. | ||
230 | /// </summary> | ||
231 | /// <param name="serialisedSceneObjects"></param> | ||
232 | protected void LoadObjects(List<string> serialisedSceneObjects) | ||
233 | { | ||
236 | // Reload serialized prims | 234 | // Reload serialized prims |
237 | m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); | 235 | m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); |
238 | 236 | ||
@@ -262,6 +260,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
262 | // to the same scene (when this is possible). | 260 | // to the same scene (when this is possible). |
263 | sceneObject.ResetIDs(); | 261 | sceneObject.ResetIDs(); |
264 | 262 | ||
263 | // Try to retain the original creator/owner/lastowner if their uuid is present on this grid | ||
264 | // or creator data is present. Otherwise, use the estate owner instead. | ||
265 | foreach (SceneObjectPart part in sceneObject.Parts) | 265 | foreach (SceneObjectPart part in sceneObject.Parts) |
266 | { | 266 | { |
267 | if (part.CreatorData == null || part.CreatorData == string.Empty) | 267 | if (part.CreatorData == null || part.CreatorData == string.Empty) |
@@ -318,11 +318,36 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
318 | int ignoredObjects = serialisedSceneObjects.Count - sceneObjectsLoadedCount; | 318 | int ignoredObjects = serialisedSceneObjects.Count - sceneObjectsLoadedCount; |
319 | 319 | ||
320 | if (ignoredObjects > 0) | 320 | if (ignoredObjects > 0) |
321 | m_log.WarnFormat("[ARCHIVER]: Ignored {0} scene objects that already existed in the scene", ignoredObjects); | 321 | m_log.WarnFormat("[ARCHIVER]: Ignored {0} scene objects that already existed in the scene", ignoredObjects); |
322 | 322 | } | |
323 | m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive"); | 323 | |
324 | 324 | /// <summary> | |
325 | m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage); | 325 | /// Load serialized parcels. |
326 | /// </summary> | ||
327 | /// <param name="serialisedParcels"></param> | ||
328 | protected void LoadParcels(List<string> serialisedParcels) | ||
329 | { | ||
330 | // Reload serialized parcels | ||
331 | m_log.InfoFormat("[ARCHIVER]: Loading {0} parcels. Please wait.", serialisedParcels.Count); | ||
332 | List<LandData> landData = new List<LandData>(); | ||
333 | foreach (string serialisedParcel in serialisedParcels) | ||
334 | { | ||
335 | LandData parcel = LandDataSerializer.Deserialize(serialisedParcel); | ||
336 | if (!ResolveUserUuid(parcel.OwnerID)) | ||
337 | parcel.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
338 | |||
339 | // m_log.DebugFormat( | ||
340 | // "[ARCHIVER]: Adding parcel {0}, local id {1}, area {2}", | ||
341 | // parcel.Name, parcel.LocalID, parcel.Area); | ||
342 | |||
343 | landData.Add(parcel); | ||
344 | } | ||
345 | |||
346 | if (!m_merge) | ||
347 | m_scene.LandChannel.Clear(false); | ||
348 | |||
349 | m_scene.EventManager.TriggerIncomingLandDataFromStorage(landData); | ||
350 | m_log.InfoFormat("[ARCHIVER]: Restored {0} parcels.", landData.Count); | ||
326 | } | 351 | } |
327 | 352 | ||
328 | /// <summary> | 353 | /// <summary> |