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 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
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);
});
--
cgit v1.1