diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 4156584..d8733f4 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -180,10 +180,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
180 | } | 180 | } |
181 | 181 | ||
182 | // Local reference to the objects in the scene (which are held in innerScene) | 182 | // Local reference to the objects in the scene (which are held in innerScene) |
183 | public Dictionary<LLUUID, SceneObjectGroup> Objects | 183 | // public Dictionary<LLUUID, SceneObjectGroup> Objects |
184 | { | 184 | // { |
185 | get { return m_innerScene.SceneObjects; } | 185 | // get { return m_innerScene.SceneObjects; } |
186 | } | 186 | // } |
187 | 187 | ||
188 | // Reference to all of the agents in the scene (root and child) | 188 | // Reference to all of the agents in the scene (root and child) |
189 | protected Dictionary<LLUUID, ScenePresence> m_scenePresences | 189 | protected Dictionary<LLUUID, ScenePresence> m_scenePresences |
@@ -192,11 +192,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
192 | set { m_innerScene.ScenePresences = value; } | 192 | set { m_innerScene.ScenePresences = value; } |
193 | } | 193 | } |
194 | 194 | ||
195 | protected Dictionary<LLUUID, SceneObjectGroup> m_sceneObjects | 195 | // protected Dictionary<LLUUID, SceneObjectGroup> m_sceneObjects |
196 | { | 196 | // { |
197 | get { return m_innerScene.SceneObjects; } | 197 | // get { return m_innerScene.SceneObjects; } |
198 | set { m_innerScene.SceneObjects = value; } | 198 | // set { m_innerScene.SceneObjects = value; } |
199 | } | 199 | // } |
200 | 200 | ||
201 | public Dictionary<LLUUID, EntityBase> Entities | 201 | public Dictionary<LLUUID, EntityBase> Entities |
202 | { | 202 | { |
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
262 | MainLog.Instance.Verbose("SCENE", "Creating new entitities instance"); | 262 | MainLog.Instance.Verbose("SCENE", "Creating new entitities instance"); |
263 | Entities = new Dictionary<LLUUID, EntityBase>(); | 263 | Entities = new Dictionary<LLUUID, EntityBase>(); |
264 | m_scenePresences = new Dictionary<LLUUID, ScenePresence>(); | 264 | m_scenePresences = new Dictionary<LLUUID, ScenePresence>(); |
265 | m_sceneObjects = new Dictionary<LLUUID, SceneObjectGroup>(); | 265 | //m_sceneObjects = new Dictionary<LLUUID, SceneObjectGroup>(); |
266 | 266 | ||
267 | MainLog.Instance.Verbose("SCENE", "Creating LandMap"); | 267 | MainLog.Instance.Verbose("SCENE", "Creating LandMap"); |
268 | Terrain = new TerrainEngine((int) RegionInfo.RegionLocX, (int) RegionInfo.RegionLocY); | 268 | Terrain = new TerrainEngine((int) RegionInfo.RegionLocX, (int) RegionInfo.RegionLocY); |
@@ -2277,20 +2277,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
2277 | /// | 2277 | /// |
2278 | /// </summary> | 2278 | /// </summary> |
2279 | /// <param name="action"></param> | 2279 | /// <param name="action"></param> |
2280 | public void ForEachObject(Action<SceneObjectGroup> action) | 2280 | // public void ForEachObject(Action<SceneObjectGroup> action) |
2281 | { | 2281 | // { |
2282 | List<SceneObjectGroup> presenceList; | 2282 | // List<SceneObjectGroup> presenceList; |
2283 | 2283 | // | |
2284 | lock (m_sceneObjects) | 2284 | // lock (m_sceneObjects) |
2285 | { | 2285 | // { |
2286 | presenceList = new List<SceneObjectGroup>(m_sceneObjects.Values); | 2286 | // presenceList = new List<SceneObjectGroup>(m_sceneObjects.Values); |
2287 | } | 2287 | // } |
2288 | 2288 | // | |
2289 | foreach (SceneObjectGroup presence in presenceList) | 2289 | // foreach (SceneObjectGroup presence in presenceList) |
2290 | { | 2290 | // { |
2291 | action(presence); | 2291 | // action(presence); |
2292 | } | 2292 | // } |
2293 | } | 2293 | // } |
2294 | 2294 | ||
2295 | /// <summary> | 2295 | /// <summary> |
2296 | /// | 2296 | /// |