diff options
author | Dan Lake | 2011-11-03 17:53:51 -0700 |
---|---|---|
committer | Dan Lake | 2011-11-03 17:53:51 -0700 |
commit | b8d50b10fbb03ed8c8a9aac94564c354559c3bb0 (patch) | |
tree | 46b0b79fee603edec1888af2f31935d07f8b9262 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to (diff) | |
download | opensim-SC_OLD-b8d50b10fbb03ed8c8a9aac94564c354559c3bb0.zip opensim-SC_OLD-b8d50b10fbb03ed8c8a9aac94564c354559c3bb0.tar.gz opensim-SC_OLD-b8d50b10fbb03ed8c8a9aac94564c354559c3bb0.tar.bz2 opensim-SC_OLD-b8d50b10fbb03ed8c8a9aac94564c354559c3bb0.tar.xz |
Rename ForEachAvatar back to ForEachScenePresence. The other changes
from previous commit which sort out which iterator is used are left
intact. A discussion is needed as to what constitutes an avatar vs a
ScenePresence.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index b996e86..0832975 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -872,7 +872,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
872 | 872 | ||
873 | try | 873 | try |
874 | { | 874 | { |
875 | ForEachAvatar(delegate(ScenePresence agent) | 875 | ForEachRootScenePresence(delegate(ScenePresence agent) |
876 | { | 876 | { |
877 | //agent.ControllingClient.new | 877 | //agent.ControllingClient.new |
878 | //this.CommsManager.InterRegion.InformRegionOfChildAgent(otherRegion.RegionHandle, agent.ControllingClient.RequestClientInfo()); | 878 | //this.CommsManager.InterRegion.InformRegionOfChildAgent(otherRegion.RegionHandle, agent.ControllingClient.RequestClientInfo()); |
@@ -1017,7 +1017,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1017 | GridRegion r = new GridRegion(region); | 1017 | GridRegion r = new GridRegion(region); |
1018 | try | 1018 | try |
1019 | { | 1019 | { |
1020 | ForEachAvatar(delegate(ScenePresence agent) | 1020 | ForEachRootScenePresence(delegate(ScenePresence agent) |
1021 | { | 1021 | { |
1022 | if (m_teleportModule != null) | 1022 | if (m_teleportModule != null) |
1023 | m_teleportModule.EnableChildAgent(agent, r); | 1023 | m_teleportModule.EnableChildAgent(agent, r); |
@@ -4228,7 +4228,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4228 | /// Avatars may be an NPC or a 'real' client. | 4228 | /// Avatars may be an NPC or a 'real' client. |
4229 | /// </summary> | 4229 | /// </summary> |
4230 | /// <param name="action"></param> | 4230 | /// <param name="action"></param> |
4231 | public void ForEachAvatar(Action<ScenePresence> action) | 4231 | public void ForEachRootScenePresence(Action<ScenePresence> action) |
4232 | { | 4232 | { |
4233 | if(m_sceneGraph != null) | 4233 | if(m_sceneGraph != null) |
4234 | { | 4234 | { |
@@ -4326,7 +4326,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4326 | /// <param name="action"></param> | 4326 | /// <param name="action"></param> |
4327 | public void ForEachRootClient(Action<IClientAPI> action) | 4327 | public void ForEachRootClient(Action<IClientAPI> action) |
4328 | { | 4328 | { |
4329 | ForEachAvatar(delegate(ScenePresence presence) | 4329 | ForEachRootScenePresence(delegate(ScenePresence presence) |
4330 | { | 4330 | { |
4331 | action(presence.ControllingClient); | 4331 | action(presence.ControllingClient); |
4332 | }); | 4332 | }); |