aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-24 22:45:13 +0000
committerJustin Clarke Casey2008-05-24 22:45:13 +0000
commitf3067ce6f9f2ea992f0e601ab120f3a1ff89cf94 (patch)
tree0ec2ccf815cba335f42b9a64f6a9cc18b0c78230 /OpenSim/Region/Environment/Modules
parent* Refactor: Renaming various *Entity*() methods to *Object*() methods on the ... (diff)
downloadopensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.zip
opensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.tar.gz
opensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.tar.bz2
opensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs2
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
73 m_log.Warn("[ARCHIVER]: Archive region not yet implemented"); 73 m_log.Warn("[ARCHIVER]: Archive region not yet implemented");
74 74
75 List<EntityBase> entities = m_scene.GetEntities(); 75 List<EntityBase> entities = m_scene.GetEntities();
76
77 foreach (EntityBase entity in entities)
78 {
79
80 }
81
76 string serEntities = SerializeObjects(entities); 82 string serEntities = SerializeObjects(entities);
77 83
78 if (serEntities != null && serEntities.Length > 0) 84 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
179 179
180 if (Util.RandomClass.NextDouble() < killLikelyhood) 180 if (Util.RandomClass.NextDouble() < killLikelyhood)
181 { 181 {
182 m_scene.RemoveObject(selectedTree.ParentGroup); 182 m_scene.RemoveSceneObject(selectedTree.ParentGroup);
183 m_trees.Remove(selectedTree.ParentGroup.UUID); 183 m_trees.Remove(selectedTree.ParentGroup.UUID);
184 184
185 m_scene.ForEachClient(delegate(IClientAPI controller) 185 m_scene.ForEachClient(delegate(IClientAPI controller)