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/ScenePresence.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/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5fc597c..f6df3c3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -956,7 +956,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
956 | } | 956 | } |
957 | 957 | ||
958 | // send the animations of the other presences to me | 958 | // send the animations of the other presences to me |
959 | m_scene.ForEachAvatar(delegate(ScenePresence presence) | 959 | m_scene.ForEachRootScenePresence(delegate(ScenePresence presence) |
960 | { | 960 | { |
961 | if (presence != this) | 961 | if (presence != this) |
962 | presence.Animator.SendAnimPackToClient(ControllingClient); | 962 | presence.Animator.SendAnimPackToClient(ControllingClient); |
@@ -2596,7 +2596,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2596 | public void SendOtherAgentsAvatarDataToMe() | 2596 | public void SendOtherAgentsAvatarDataToMe() |
2597 | { | 2597 | { |
2598 | int count = 0; | 2598 | int count = 0; |
2599 | m_scene.ForEachAvatar(delegate(ScenePresence scenePresence) | 2599 | m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence) |
2600 | { | 2600 | { |
2601 | // only send information about other root agents | 2601 | // only send information about other root agents |
2602 | if (scenePresence.UUID == UUID) | 2602 | if (scenePresence.UUID == UUID) |
@@ -2660,7 +2660,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2660 | // m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} {1}", Name, UUID); | 2660 | // m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} {1}", Name, UUID); |
2661 | 2661 | ||
2662 | int count = 0; | 2662 | int count = 0; |
2663 | m_scene.ForEachAvatar(delegate(ScenePresence scenePresence) | 2663 | m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence) |
2664 | { | 2664 | { |
2665 | // only send information about other root agents | 2665 | // only send information about other root agents |
2666 | if (scenePresence.UUID == UUID) | 2666 | if (scenePresence.UUID == UUID) |