* Fix http://opensimulator.org/mantis/view.php?id=2517

* Don't save attachments on saving oar, which stops them coming back as ghost prims

1 files changed, 6 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 4a51398..8c623b1 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -273,7 +273,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             foreach (EntityBase entity in entities)
             {
                 if (entity is SceneObjectGroup)
-                    sceneObjects.Add((SceneObjectGroup)entity);
+                {
+                    SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
+                    
+                    if (sceneObject.RootPart != null && !sceneObject.RootPart.IsAttachment)
+                        sceneObjects.Add((SceneObjectGroup)entity);
+                }
             }
 
             foreach (SceneObjectGroup sceneObject in sceneObjects)