* fix a bug where I was assuming all entities would be SceneObjectGroups - of course, some are ScenePresences

* would be nice to have a separate list in InnerScene in the future since a lot of methods end up screen entities for SOGs

2 files changed, 18 insertions, 11 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
index 3799c57..3ef8149 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -50,11 +50,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected IRegionSerialiser m_serialiser;
-        protected List<EntityBase> m_sceneObjects;
+        protected List<SceneObjectGroup> m_sceneObjects;
         protected string m_savePath;
 
         public ArchiveWriteRequestExecution(
-             List<EntityBase> sceneObjects, IRegionSerialiser serialiser, string savePath)
+             List<SceneObjectGroup> sceneObjects, IRegionSerialiser serialiser, string savePath)
         {
             m_sceneObjects = sceneObjects;
             m_serialiser = serialiser;
@@ -67,10 +67,10 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
 
             TarArchiveWriter archive = new TarArchiveWriter();
             
-            foreach (EntityBase entity in m_sceneObjects)
+            foreach (SceneObjectGroup sceneObject in m_sceneObjects)
             {
-                // FIXME: I'm fairly sure that all entities are in fact SceneObjectGroups...  must fix this
-                SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
+                //m_log.DebugFormat("[ARCHIVER]: Saving {0} {1}, {2}", entity.Name, entity.UUID, entity.GetType());
+                
                 LLVector3 position = sceneObject.AbsolutePosition;
                 
                 string serializedObject = m_serialiser.SaveGroupToXml2(sceneObject);
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 5d63ce4..bed30b0 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -163,24 +163,31 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             Dictionary<LLUUID, int> assetUuids = new Dictionary<LLUUID, int>();
 
             List<EntityBase> entities = m_scene.GetEntities();
+            List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
 
+            // Filter entities so that we only have scene objects.
+            // FIXME: Would be nicer to have this as a proper list in InnerScene, since lots of methods
+            // end up having to do this
             foreach (EntityBase entity in entities)
             {
                 if (entity is SceneObjectGroup)
-                {
-                    GetSceneObjectAssetUuids((SceneObjectGroup)entity, assetUuids);
-                }
+                    sceneObjects.Add((SceneObjectGroup)entity);
+            }
+            
+            foreach (SceneObjectGroup sceneObject in sceneObjects)
+            {
+                GetSceneObjectAssetUuids(sceneObject, assetUuids);
             }
 
-            if (entities.Count > 0)
+            if (sceneObjects.Count > 0)
             {
-                m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count);
+                m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} scene objects", sceneObjects.Count);
                 m_log.DebugFormat("[ARCHIVER]: Requiring save of {0} assets", assetUuids.Count);
 
                 // Asynchronously request all the assets required to perform this archive operation
                 ArchiveWriteRequestExecution awre 
                     = new ArchiveWriteRequestExecution(
-                        entities, m_scene.RequestModuleInterface<IRegionSerialiser>(), m_savePath);
+                        sceneObjects, m_scene.RequestModuleInterface<IRegionSerialiser>(), m_savePath);
                 new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute();
             }
         }