aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/WorldMap
diff options
context:
space:
mode:
authorDan Lake2011-11-03 17:53:51 -0700
committerDan Lake2011-11-03 17:53:51 -0700
commitb8d50b10fbb03ed8c8a9aac94564c354559c3bb0 (patch)
tree46b0b79fee603edec1888af2f31935d07f8b9262 /OpenSim/Region/CoreModules/World/WorldMap
parentRenamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to (diff)
downloadopensim-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 'OpenSim/Region/CoreModules/World/WorldMap')
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index cd4d7e3..00d7d55 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -401,7 +401,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
401 } 401 }
402 else 402 else
403 { 403 {
404 m_scene.ForEachAvatar(delegate(ScenePresence sp) 404 m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
405 { 405 {
406 // Don't send a green dot for yourself 406 // Don't send a green dot for yourself
407 if (sp.UUID != remoteClient.AgentId) 407 if (sp.UUID != remoteClient.AgentId)
@@ -1180,7 +1180,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1180 else 1180 else
1181 { 1181 {
1182 OSDArray responsearr = new OSDArray(m_scene.GetRootAgentCount()); 1182 OSDArray responsearr = new OSDArray(m_scene.GetRootAgentCount());
1183 m_scene.ForEachAvatar(delegate(ScenePresence sp) 1183 m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
1184 { 1184 {
1185 OSDMap responsemapdata = new OSDMap(); 1185 OSDMap responsemapdata = new OSDMap();
1186 responsemapdata["X"] = OSD.FromInteger((int)(xstart + sp.AbsolutePosition.X)); 1186 responsemapdata["X"] = OSD.FromInteger((int)(xstart + sp.AbsolutePosition.X));