From b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sat, 1 Nov 2008 21:28:52 +0000
Subject: * Fix http://opensimulator.org/mantis/view.php?id=2517 * Don't save
 attachments on saving oar, which stops them coming back as ghost prims

---
 .../Modules/World/Archiver/ArchiveWriteRequestPreparation.cs       | 7 ++++++-
 OpenSim/Region/Environment/Scenes/EntityBase.cs                    | 2 +-
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs              | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment')

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)
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index afdbb91..7a3b9a7 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         /// <summary>
-        /// Signals whether this group was in a scene but has since been deleted from it.
+        /// Signals whether this entity was in a scene but has since been removed from it.
         /// </summary>
         public bool IsDeleted
         {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 98c7fb5..f4b6685 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -741,7 +741,6 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     m_scene.PhysicsScene.RemovePrim(m_rootPart.PhysActor);
                     m_rootPart.PhysActor = null;
-
                 }
 
                 AbsolutePosition = AttachOffset;
-- 
cgit v1.1