diff options
author | Justin Clarke Casey | 2008-11-01 21:50:07 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-01 21:50:07 +0000 |
commit | 7c04d278753c717a91e5eeb3086d62c771b03f05 (patch) | |
tree | d12e2a986af35e1c9b2cd45187e1ead4abb9ea26 /OpenSim/Region/Environment/Modules/World | |
parent | * Fix http://opensimulator.org/mantis/view.php?id=2517 (diff) | |
download | opensim-SC_OLD-7c04d278753c717a91e5eeb3086d62c771b03f05.zip opensim-SC_OLD-7c04d278753c717a91e5eeb3086d62c771b03f05.tar.gz opensim-SC_OLD-7c04d278753c717a91e5eeb3086d62c771b03f05.tar.bz2 opensim-SC_OLD-7c04d278753c717a91e5eeb3086d62c771b03f05.tar.xz |
* Introduce an IsAttachment property on the group level (which just returns false if the group is already deleted)
* This is to avoid repetitive null checks - I'm beginning to think that blasting away the root part on object deletion is actually a bad move. Perhaps we should leave it around
and let the client ignore any superfluous packets (which it may well do anyway), since we're constantly exposing a race condition
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs index 8c623b1..b520642 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -276,7 +276,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
276 | { | 276 | { |
277 | SceneObjectGroup sceneObject = (SceneObjectGroup)entity; | 277 | SceneObjectGroup sceneObject = (SceneObjectGroup)entity; |
278 | 278 | ||
279 | if (sceneObject.RootPart != null && !sceneObject.RootPart.IsAttachment) | 279 | if (!sceneObject.IsDeleted && !sceneObject.IsAttachment) |
280 | sceneObjects.Add((SceneObjectGroup)entity); | 280 | sceneObjects.Add((SceneObjectGroup)entity); |
281 | } | 281 | } |
282 | } | 282 | } |