* Refactor: Change previous commits Object methods to SceneObject methods instead, on the basis that this is less likely to cause confusion with c#'s base object type

2 files changed, 7 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
index ce78f21..27f16a7 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
@@ -73,6 +73,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             m_log.Warn("[ARCHIVER]: Archive region not yet implemented");
             
             List<EntityBase> entities = m_scene.GetEntities();
+            
+            foreach (EntityBase entity in entities)
+            {
+                
+            }
+            
             string serEntities = SerializeObjects(entities);  
             
             if (serEntities != null && serEntities.Length > 0)
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
index ae70436..c56ed08 100644
--- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator
 
                     if (Util.RandomClass.NextDouble() < killLikelyhood)
                     {
-                        m_scene.RemoveObject(selectedTree.ParentGroup);
+                        m_scene.RemoveSceneObject(selectedTree.ParentGroup);
                         m_trees.Remove(selectedTree.ParentGroup.UUID);
 
                         m_scene.ForEachClient(delegate(IClientAPI controller)