From b8d50b10fbb03ed8c8a9aac94564c354559c3bb0 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Thu, 3 Nov 2011 17:53:51 -0700
Subject: 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.
---
OpenSim/Region/Framework/Scenes/Scene.cs | 8 ++++----
OpenSim/Region/Framework/Scenes/SceneManager.cs | 2 +-
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +-
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 8 ++++----
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
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
try
{
- ForEachAvatar(delegate(ScenePresence agent)
+ ForEachRootScenePresence(delegate(ScenePresence agent)
{
//agent.ControllingClient.new
//this.CommsManager.InterRegion.InformRegionOfChildAgent(otherRegion.RegionHandle, agent.ControllingClient.RequestClientInfo());
@@ -1017,7 +1017,7 @@ namespace OpenSim.Region.Framework.Scenes
GridRegion r = new GridRegion(region);
try
{
- ForEachAvatar(delegate(ScenePresence agent)
+ ForEachRootScenePresence(delegate(ScenePresence agent)
{
if (m_teleportModule != null)
m_teleportModule.EnableChildAgent(agent, r);
@@ -4228,7 +4228,7 @@ namespace OpenSim.Region.Framework.Scenes
/// Avatars may be an NPC or a 'real' client.
///
///
- public void ForEachAvatar(Action action)
+ public void ForEachRootScenePresence(Action action)
{
if(m_sceneGraph != null)
{
@@ -4326,7 +4326,7 @@ namespace OpenSim.Region.Framework.Scenes
///
public void ForEachRootClient(Action action)
{
- ForEachAvatar(delegate(ScenePresence presence)
+ ForEachRootScenePresence(delegate(ScenePresence presence)
{
action(presence.ControllingClient);
});
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 9b72bee..eeb087f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -481,7 +481,7 @@ namespace OpenSim.Region.Framework.Scenes
ForEachCurrentScene(
delegate(Scene scene)
{
- scene.ForEachAvatar(delegate(ScenePresence scenePresence)
+ scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
{
avatars.Add(scenePresence);
});
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 3c80eb5..ef2682f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1150,7 +1150,7 @@ namespace OpenSim.Region.Framework.Scenes
{
SceneObjectPart part = parts[i];
- Scene.ForEachAvatar(delegate(ScenePresence avatar)
+ Scene.ForEachRootScenePresence(delegate(ScenePresence avatar)
{
if (avatar.ParentID == LocalId)
avatar.StandUp();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 1a709e9..b77f1b6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2216,7 +2216,7 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
- m_parentGroup.Scene.ForEachAvatar(delegate(ScenePresence av)
+ m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence av)
{
if (av.LocalId == localId)
{
@@ -2347,7 +2347,7 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
- m_parentGroup.Scene.ForEachAvatar(delegate(ScenePresence av)
+ m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence av)
{
if (av.LocalId == localId)
{
@@ -2470,7 +2470,7 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
- m_parentGroup.Scene.ForEachAvatar(delegate(ScenePresence av)
+ m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence av)
{
if (av.LocalId == localId)
{
@@ -2696,7 +2696,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- m_parentGroup.Scene.ForEachAvatar(delegate(ScenePresence sp)
+ m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp)
{
if (!(Util.GetDistanceTo(sp.AbsolutePosition, AbsolutePosition) >= 100))
sp.ControllingClient.SendPreLoadSound(objectID, objectID, soundID);
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
}
// send the animations of the other presences to me
- m_scene.ForEachAvatar(delegate(ScenePresence presence)
+ m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
{
if (presence != this)
presence.Animator.SendAnimPackToClient(ControllingClient);
@@ -2596,7 +2596,7 @@ namespace OpenSim.Region.Framework.Scenes
public void SendOtherAgentsAvatarDataToMe()
{
int count = 0;
- m_scene.ForEachAvatar(delegate(ScenePresence scenePresence)
+ m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
{
// only send information about other root agents
if (scenePresence.UUID == UUID)
@@ -2660,7 +2660,7 @@ namespace OpenSim.Region.Framework.Scenes
// m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} {1}", Name, UUID);
int count = 0;
- m_scene.ForEachAvatar(delegate(ScenePresence scenePresence)
+ m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
{
// only send information about other root agents
if (scenePresence.UUID == UUID)
--
cgit v1.1