diff options
| author | John Hurliman | 2010-09-16 17:30:46 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-09-16 17:30:46 -0700 |
| commit | 860b2a502f797e5822c6705d4639f370f3ac5861 (patch) | |
| tree | 5a74ddbd626142e27f6c3439ea267b8ea348ce9c /OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |
| parent | Add the modules include line back that i dropped by mistake (diff) | |
| download | opensim-SC_OLD-860b2a502f797e5822c6705d4639f370f3ac5861.zip opensim-SC_OLD-860b2a502f797e5822c6705d4639f370f3ac5861.tar.gz opensim-SC_OLD-860b2a502f797e5822c6705d4639f370f3ac5861.tar.bz2 opensim-SC_OLD-860b2a502f797e5822c6705d4639f370f3ac5861.tar.xz | |
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 1fba6c2..6b538f6 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
| @@ -243,11 +243,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 243 | // to the same scene (when this is possible). | 243 | // to the same scene (when this is possible). |
| 244 | sceneObject.ResetIDs(); | 244 | sceneObject.ResetIDs(); |
| 245 | 245 | ||
| 246 | List<SceneObjectPart> partList = null; | 246 | foreach (SceneObjectPart part in sceneObject.Parts) |
| 247 | lock (sceneObject.Children) | ||
| 248 | partList = new List<SceneObjectPart>(sceneObject.Children.Values); | ||
| 249 | |||
| 250 | foreach (SceneObjectPart part in partList) | ||
| 251 | { | 247 | { |
| 252 | if (!ResolveUserUuid(part.CreatorID)) | 248 | if (!ResolveUserUuid(part.CreatorID)) |
| 253 | part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner; | 249 | part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner; |