diff options
author | Justin Clarke Casey | 2008-01-07 02:33:22 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-01-07 02:33:22 +0000 |
commit | 95c9a9939efc41e2f35defac5e3d7dae40890876 (patch) | |
tree | cd97a4b9c4feb9c4c1f6fa4b1c74e092ff97acac /OpenSim/Region | |
parent | Persistent prim inventory phase 5. Restart scripts contained in persisted pr... (diff) | |
download | opensim-SC_OLD-95c9a9939efc41e2f35defac5e3d7dae40890876.zip opensim-SC_OLD-95c9a9939efc41e2f35defac5e3d7dae40890876.tar.gz opensim-SC_OLD-95c9a9939efc41e2f35defac5e3d7dae40890876.tar.bz2 opensim-SC_OLD-95c9a9939efc41e2f35defac5e3d7dae40890876.tar.xz |
Commenting out InnerScene.SceneObjects for now since it was unpopulated and not used by active code (as far as I can see), so a source of confusion. All
current code uses the Entities dictionary
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 48 | ||||
-rw-r--r-- | OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs | 4 |
3 files changed, 30 insertions, 27 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 794cdae..0935b43 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -51,7 +51,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
51 | #region Fields | 51 | #region Fields |
52 | 52 | ||
53 | public Dictionary<LLUUID, ScenePresence> ScenePresences; | 53 | public Dictionary<LLUUID, ScenePresence> ScenePresences; |
54 | public Dictionary<LLUUID, SceneObjectGroup> SceneObjects; | 54 | // SceneObjects is not currently populated or used. |
55 | //public Dictionary<LLUUID, SceneObjectGroup> SceneObjects; | ||
55 | public Dictionary<LLUUID, EntityBase> Entities; | 56 | public Dictionary<LLUUID, EntityBase> Entities; |
56 | 57 | ||
57 | public BasicQuadTreeNode QuadTree; | 58 | public BasicQuadTreeNode QuadTree; |
@@ -110,7 +111,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
110 | public void Close() | 111 | public void Close() |
111 | { | 112 | { |
112 | ScenePresences.Clear(); | 113 | ScenePresences.Clear(); |
113 | SceneObjects.Clear(); | 114 | //SceneObjects.Clear(); |
114 | Entities.Clear(); | 115 | Entities.Clear(); |
115 | } | 116 | } |
116 | 117 | ||
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 | /// |
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs index d6613e9..b3a0d4f 100644 --- a/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs +++ b/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs | |||
@@ -69,7 +69,9 @@ namespace OpenSim.Region.ExtensionsScriptModule | |||
69 | /// </summary> | 69 | /// </summary> |
70 | public SceneObjectGroup Task | 70 | public SceneObjectGroup Task |
71 | { | 71 | { |
72 | get { return Scene.Objects[ObjectID]; } | 72 | // XXX Casting not ideal, but previous Scene.Objects propery wasn't actually populated, so |
73 | // wouldn't have worked anyway. | ||
74 | get { return (SceneObjectGroup)Scene.Entities[ObjectID]; } | ||
73 | } | 75 | } |
74 | 76 | ||
75 | /// <summary> | 77 | /// <summary> |