diff options
author | Justin Clarke Casey | 2008-05-13 18:25:15 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-13 18:25:15 +0000 |
commit | 3025dafa9221f51e4f290b0419c48e914dcf5a32 (patch) | |
tree | 90e2f8cfa3e6ccf8c1afc9bf988354987f301860 /OpenSim/Region/Environment/Scenes | |
parent | *Fixed compile error on last commit (diff) | |
download | opensim-SC_OLD-3025dafa9221f51e4f290b0419c48e914dcf5a32.zip opensim-SC_OLD-3025dafa9221f51e4f290b0419c48e914dcf5a32.tar.gz opensim-SC_OLD-3025dafa9221f51e4f290b0419c48e914dcf5a32.tar.bz2 opensim-SC_OLD-3025dafa9221f51e4f290b0419c48e914dcf5a32.tar.xz |
* Refactor: Stop exposing the inner scene's ScenePresence dictionary directly to the world
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 8b9b888..aadcff6 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
53 | 53 | ||
54 | #region Fields | 54 | #region Fields |
55 | 55 | ||
56 | public Dictionary<LLUUID, ScenePresence> ScenePresences; | 56 | internal Dictionary<LLUUID, ScenePresence> ScenePresences; |
57 | // SceneObjects is not currently populated or used. | 57 | // SceneObjects is not currently populated or used. |
58 | //public Dictionary<LLUUID, SceneObjectGroup> SceneObjects; | 58 | //public Dictionary<LLUUID, SceneObjectGroup> SceneObjects; |
59 | public Dictionary<LLUUID, EntityBase> Entities; | 59 | public Dictionary<LLUUID, EntityBase> Entities; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index faa595f..d017c50 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -207,6 +207,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
207 | get { return m_innerScene.Entities; } | 207 | get { return m_innerScene.Entities; } |
208 | set { m_innerScene.Entities = value; } | 208 | set { m_innerScene.Entities = value; } |
209 | } | 209 | } |
210 | |||
210 | public Dictionary<LLUUID, ScenePresence> m_restorePresences | 211 | public Dictionary<LLUUID, ScenePresence> m_restorePresences |
211 | { | 212 | { |
212 | get { return m_innerScene.RestorePresences; } | 213 | get { return m_innerScene.RestorePresences; } |
@@ -3095,7 +3096,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3095 | } | 3096 | } |
3096 | 3097 | ||
3097 | /// <summary> | 3098 | /// <summary> |
3098 | /// Request a List of all m_scenePresences in this World | 3099 | /// Request a List of all ScenePresences in this region |
3099 | /// </summary> | 3100 | /// </summary> |
3100 | /// <returns></returns> | 3101 | /// <returns></returns> |
3101 | public List<ScenePresence> GetScenePresences() | 3102 | public List<ScenePresence> GetScenePresences() |
@@ -3104,7 +3105,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3104 | } | 3105 | } |
3105 | 3106 | ||
3106 | /// <summary> | 3107 | /// <summary> |
3107 | /// Request a filtered list of m_scenePresences in this World | 3108 | /// Request a filtered list of ScenePresences in this region |
3108 | /// </summary> | 3109 | /// </summary> |
3109 | /// <param name="filter"></param> | 3110 | /// <param name="filter"></param> |
3110 | /// <returns></returns> | 3111 | /// <returns></returns> |
@@ -3114,7 +3115,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3114 | } | 3115 | } |
3115 | 3116 | ||
3116 | /// <summary> | 3117 | /// <summary> |
3117 | /// Request a Avatar by UUID | 3118 | /// Request a scene presence by UUID |
3118 | /// </summary> | 3119 | /// </summary> |
3119 | /// <param name="avatarID"></param> | 3120 | /// <param name="avatarID"></param> |
3120 | /// <returns></returns> | 3121 | /// <returns></returns> |