diff options
author | Justin Clarke Casey | 2008-05-24 21:57:00 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-24 21:57:00 +0000 |
commit | 42693f3b20cf139820aca42b5dd07938a3f96022 (patch) | |
tree | b52c4616ab9429970610dbff20509726ede25c78 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | * Refactor: Make some inner scene dictionaries internal rather than public (diff) | |
download | opensim-SC-42693f3b20cf139820aca42b5dd07938a3f96022.zip opensim-SC-42693f3b20cf139820aca42b5dd07938a3f96022.tar.gz opensim-SC-42693f3b20cf139820aca42b5dd07938a3f96022.tar.bz2 opensim-SC-42693f3b20cf139820aca42b5dd07938a3f96022.tar.xz |
* Refactor: Push some dictionary initialization down from Scene into InnerScene
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 60ba898..7c198bf 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -261,12 +261,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
261 | 261 | ||
262 | RegisterDefaultSceneEvents(); | 262 | RegisterDefaultSceneEvents(); |
263 | 263 | ||
264 | m_log.Info("[SCENE]: Creating new entitities instance"); | ||
265 | Entities = new Dictionary<LLUUID, EntityBase>(); | ||
266 | m_scenePresences = new Dictionary<LLUUID, ScenePresence>(); | ||
267 | //m_sceneObjects = new Dictionary<LLUUID, SceneObjectGroup>(); | ||
268 | m_restorePresences = new Dictionary<LLUUID, ScenePresence>(); | ||
269 | |||
270 | m_httpListener = httpServer; | 264 | m_httpListener = httpServer; |
271 | m_dumpAssetsToFile = dumpAssetsToFile; | 265 | m_dumpAssetsToFile = dumpAssetsToFile; |
272 | 266 | ||
@@ -3225,6 +3219,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
3225 | m_innerScene.ForEachClient(action); | 3219 | m_innerScene.ForEachClient(action); |
3226 | } | 3220 | } |
3227 | 3221 | ||
3222 | /// <summary> | ||
3223 | /// Returns a list of the entities in the scene. This is a new list so operations perform on the list itself | ||
3224 | /// will not affect the original list of objects in the scene. | ||
3225 | /// </summary> | ||
3226 | /// <returns></returns> | ||
3228 | public List<EntityBase> GetEntities() | 3227 | public List<EntityBase> GetEntities() |
3229 | { | 3228 | { |
3230 | return m_innerScene.GetEntities(); | 3229 | return m_innerScene.GetEntities(); |