aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
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
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')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Sound/SoundModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs2
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs4
15 files changed, 34 insertions, 34 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 783a03b..10b4c37 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -230,7 +230,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
230 { 230 {
231 // This should use ForEachClient, but clients don't have a position. 231 // This should use ForEachClient, but clients don't have a position.
232 // If camera is moved into client, then camera position can be used 232 // If camera is moved into client, then camera position can be used
233 s.ForEachAvatar( 233 s.ForEachRootScenePresence(
234 delegate(ScenePresence presence) 234 delegate(ScenePresence presence)
235 { 235 {
236 if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, c.Type, message, sourceType)) 236 if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, c.Type, message, sourceType))
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index ff3b107..0da0de3 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -476,7 +476,7 @@ namespace OpenSim.Region.CoreModules.World.Land
476 476
477 public void SendLandUpdateToAvatarsOverMe(bool snap_selection) 477 public void SendLandUpdateToAvatarsOverMe(bool snap_selection)
478 { 478 {
479 m_scene.ForEachAvatar(delegate(ScenePresence avatar) 479 m_scene.ForEachRootScenePresence(delegate(ScenePresence avatar)
480 { 480 {
481 ILandObject over = null; 481 ILandObject over = null;
482 try 482 try
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index fcbc159..93b1005 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
70 70
71 SceneObjectGroup grp = part.ParentGroup; 71 SceneObjectGroup grp = part.ParentGroup;
72 72
73 m_scene.ForEachAvatar(delegate(ScenePresence sp) 73 m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
74 { 74 {
75 double dis = Util.GetDistanceTo(sp.AbsolutePosition, position); 75 double dis = Util.GetDistanceTo(sp.AbsolutePosition, position);
76 if (dis > 100.0) // Max audio distance 76 if (dis > 100.0) // Max audio distance
@@ -119,7 +119,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
119 } 119 }
120 } 120 }
121 121
122 m_scene.ForEachAvatar(delegate(ScenePresence sp) 122 m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
123 { 123 {
124 double dis = Util.GetDistanceTo(sp.AbsolutePosition, position); 124 double dis = Util.GetDistanceTo(sp.AbsolutePosition, position);
125 if (dis > 100.0) // Max audio distance 125 if (dis > 100.0) // Max audio distance
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));
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 });
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
481 ForEachCurrentScene( 481 ForEachCurrentScene(
482 delegate(Scene scene) 482 delegate(Scene scene)
483 { 483 {
484 scene.ForEachAvatar(delegate(ScenePresence scenePresence) 484 scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
485 { 485 {
486 avatars.Add(scenePresence); 486 avatars.Add(scenePresence);
487 }); 487 });
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
1150 { 1150 {
1151 SceneObjectPart part = parts[i]; 1151 SceneObjectPart part = parts[i];
1152 1152
1153 Scene.ForEachAvatar(delegate(ScenePresence avatar) 1153 Scene.ForEachRootScenePresence(delegate(ScenePresence avatar)
1154 { 1154 {
1155 if (avatar.ParentID == LocalId) 1155 if (avatar.ParentID == LocalId)
1156 avatar.StandUp(); 1156 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
2216 } 2216 }
2217 else 2217 else
2218 { 2218 {
2219 m_parentGroup.Scene.ForEachAvatar(delegate(ScenePresence av) 2219 m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence av)
2220 { 2220 {
2221 if (av.LocalId == localId) 2221 if (av.LocalId == localId)
2222 { 2222 {
@@ -2347,7 +2347,7 @@ namespace OpenSim.Region.Framework.Scenes
2347 } 2347 }
2348 else 2348 else
2349 { 2349 {
2350 m_parentGroup.Scene.ForEachAvatar(delegate(ScenePresence av) 2350 m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence av)
2351 { 2351 {
2352 if (av.LocalId == localId) 2352 if (av.LocalId == localId)
2353 { 2353 {
@@ -2470,7 +2470,7 @@ namespace OpenSim.Region.Framework.Scenes
2470 } 2470 }
2471 else 2471 else
2472 { 2472 {
2473 m_parentGroup.Scene.ForEachAvatar(delegate(ScenePresence av) 2473 m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence av)
2474 { 2474 {
2475 if (av.LocalId == localId) 2475 if (av.LocalId == localId)
2476 { 2476 {
@@ -2696,7 +2696,7 @@ namespace OpenSim.Region.Framework.Scenes
2696 } 2696 }
2697 } 2697 }
2698 2698
2699 m_parentGroup.Scene.ForEachAvatar(delegate(ScenePresence sp) 2699 m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp)
2700 { 2700 {
2701 if (!(Util.GetDistanceTo(sp.AbsolutePosition, AbsolutePosition) >= 100)) 2701 if (!(Util.GetDistanceTo(sp.AbsolutePosition, AbsolutePosition) >= 100))
2702 sp.ControllingClient.SendPreLoadSound(objectID, objectID, soundID); 2702 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
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)
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
index 5a3a62f..28f04b3 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
112 { 112 {
113 foreach (Scene scene in m_scenes.Values) 113 foreach (Scene scene in m_scenes.Values)
114 { 114 {
115 scene.ForEachAvatar(sp => scene.AvatarFactory.SendAppearance(sp.UUID)); 115 scene.ForEachRootScenePresence(sp => scene.AvatarFactory.SendAppearance(sp.UUID));
116 } 116 }
117 } 117 }
118 } 118 }
@@ -123,7 +123,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
123 { 123 {
124 foreach (Scene scene in m_scenes.Values) 124 foreach (Scene scene in m_scenes.Values)
125 { 125 {
126 scene.ForEachAvatar( 126 scene.ForEachRootScenePresence(
127 delegate(ScenePresence sp) 127 delegate(ScenePresence sp)
128 { 128 {
129 bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(sp); 129 bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(sp);
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index bea5807..e22618d 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -373,7 +373,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
373 scene.GetRootAgentCount(), scene.RegionInfo.RegionName, 373 scene.GetRootAgentCount(), scene.RegionInfo.RegionName,
374 scene.RegionInfo.RegionID, 374 scene.RegionInfo.RegionID,
375 DateTime.UtcNow.ToString("s"))); 375 DateTime.UtcNow.ToString("s")));
376 scene.ForEachAvatar(delegate(ScenePresence sp) 376 scene.ForEachRootScenePresence(delegate(ScenePresence sp)
377 { 377 {
378 list.Append(String.Format(" <avatar name=\"{0}\" uuid=\"{1}\" />\n", sp.Name, sp.UUID)); 378 list.Append(String.Format(" <avatar name=\"{0}\" uuid=\"{1}\" />\n", sp.Name, sp.UUID));
379 list.Append("</avatars>"); 379 list.Append("</avatars>");
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 33abae2..92cbbc6 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -711,7 +711,7 @@ namespace OpenSim.Region.RegionCombinerModule
711 711
712 List<Vector3> CoarseLocations = new List<Vector3>(); 712 List<Vector3> CoarseLocations = new List<Vector3>();
713 List<UUID> AvatarUUIDs = new List<UUID>(); 713 List<UUID> AvatarUUIDs = new List<UUID>();
714 connectiondata.RegionScene.ForEachAvatar(delegate(ScenePresence sp) 714 connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp)
715 { 715 {
716 if (sp.UUID != presence.UUID) 716 if (sp.UUID != presence.UUID)
717 { 717 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d2ddcef..5ed8c47 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3740,7 +3740,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3740 m_host.AddScriptLPS(1); 3740 m_host.AddScriptLPS(1);
3741 List<UUID> keytable = new List<UUID>(); 3741 List<UUID> keytable = new List<UUID>();
3742 // parse for sitting avatare-uuids 3742 // parse for sitting avatare-uuids
3743 World.ForEachAvatar(delegate(ScenePresence presence) 3743 World.ForEachRootScenePresence(delegate(ScenePresence presence)
3744 { 3744 {
3745 if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID)) 3745 if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
3746 keytable.Add(presence.UUID); 3746 keytable.Add(presence.UUID);
@@ -3802,7 +3802,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3802 m_host.AddScriptLPS(1); 3802 m_host.AddScriptLPS(1);
3803 // parse for sitting avatare-names 3803 // parse for sitting avatare-names
3804 List<String> nametable = new List<String>(); 3804 List<String> nametable = new List<String>();
3805 World.ForEachAvatar(delegate(ScenePresence presence) 3805 World.ForEachRootScenePresence(delegate(ScenePresence presence)
3806 { 3806 {
3807 if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID)) 3807 if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
3808 nametable.Add(presence.ControllingClient.Name); 3808 nametable.Add(presence.ControllingClient.Name);
@@ -7611,7 +7611,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7611 { 7611 {
7612 m_host.AddScriptLPS(1); 7612 m_host.AddScriptLPS(1);
7613 int avatarCount = 0; 7613 int avatarCount = 0;
7614 World.ForEachAvatar(delegate(ScenePresence presence) 7614 World.ForEachRootScenePresence(delegate(ScenePresence presence)
7615 { 7615 {
7616 if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID)) 7616 if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
7617 avatarCount++; 7617 avatarCount++;
@@ -9379,7 +9379,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9379 landObject.SetMediaUrl(url); 9379 landObject.SetMediaUrl(url);
9380 9380
9381 // now send to all (non-child) agents in the parcel 9381 // now send to all (non-child) agents in the parcel
9382 World.ForEachAvatar(delegate(ScenePresence sp) 9382 World.ForEachRootScenePresence(delegate(ScenePresence sp)
9383 { 9383 {
9384 if (sp.currentParcelUUID == landData.GlobalID) 9384 if (sp.currentParcelUUID == landData.GlobalID)
9385 { 9385 {
@@ -9412,7 +9412,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9412 if (presence == null) 9412 if (presence == null)
9413 { 9413 {
9414 // send to all (non-child) agents in the parcel 9414 // send to all (non-child) agents in the parcel
9415 World.ForEachAvatar(delegate(ScenePresence sp) 9415 World.ForEachRootScenePresence(delegate(ScenePresence sp)
9416 { 9416 {
9417 if (sp.currentParcelUUID == landData.GlobalID) 9417 if (sp.currentParcelUUID == landData.GlobalID)
9418 { 9418 {
@@ -10527,7 +10527,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10527 10527
10528 if (checkAgents) 10528 if (checkAgents)
10529 { 10529 {
10530 World.ForEachAvatar(delegate(ScenePresence sp) 10530 World.ForEachRootScenePresence(delegate(ScenePresence sp)
10531 { 10531 {
10532 if (sp.AbsolutePosition.ApproxEquals(posToCheck, sp.PhysicsActor.Size.X)) 10532 if (sp.AbsolutePosition.ApproxEquals(posToCheck, sp.PhysicsActor.Size.X))
10533 { 10533 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 3138131..f3206ac 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -873,7 +873,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
873 CheckThreatLevel(ThreatLevel.None, "osGetAgents"); 873 CheckThreatLevel(ThreatLevel.None, "osGetAgents");
874 874
875 LSL_List result = new LSL_List(); 875 LSL_List result = new LSL_List();
876 World.ForEachAvatar(delegate(ScenePresence sp) 876 World.ForEachRootScenePresence(delegate(ScenePresence sp)
877 { 877 {
878 result.Add(new LSL_String(sp.Name)); 878 result.Add(new LSL_String(sp.Name));
879 }); 879 });
@@ -2581,7 +2581,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2581 CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); 2581 CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
2582 if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID)) 2582 if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
2583 { 2583 {
2584 World.ForEachAvatar(delegate(ScenePresence sp) 2584 World.ForEachRootScenePresence(delegate(ScenePresence sp)
2585 { 2585 {
2586 if (sp.Firstname == FirstName && sp.Lastname == SurName) 2586 if (sp.Firstname == FirstName && sp.Lastname == SurName)
2587 { 2587 {
@@ -2715,7 +2715,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2715 CheckThreatLevel(ThreatLevel.None, "osGetAvatarList"); 2715 CheckThreatLevel(ThreatLevel.None, "osGetAvatarList");
2716 2716
2717 LSL_List result = new LSL_List(); 2717 LSL_List result = new LSL_List();
2718 World.ForEachAvatar(delegate (ScenePresence avatar) 2718 World.ForEachRootScenePresence(delegate (ScenePresence avatar)
2719 { 2719 {
2720 if (avatar != null && avatar.UUID != m_host.OwnerID) 2720 if (avatar != null && avatar.UUID != m_host.OwnerID)
2721 { 2721 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index eb05f16..5527d14 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -507,7 +507,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
507 senseEntity(sp); 507 senseEntity(sp);
508 if ((ts.type & AGENT_BY_USERNAME) != 0) 508 if ((ts.type & AGENT_BY_USERNAME) != 0)
509 { 509 {
510 m_CmdManager.m_ScriptEngine.World.ForEachAvatar( 510 m_CmdManager.m_ScriptEngine.World.ForEachRootScenePresence(
511 delegate (ScenePresence ssp) 511 delegate (ScenePresence ssp)
512 { 512 {
513 if (ssp.Lastname == "Resident") 513 if (ssp.Lastname == "Resident")
@@ -526,7 +526,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
526 } 526 }
527 else 527 else
528 { 528 {
529 m_CmdManager.m_ScriptEngine.World.ForEachAvatar(senseEntity); 529 m_CmdManager.m_ScriptEngine.World.ForEachRootScenePresence(senseEntity);
530 } 530 }
531 return sensedEntities; 531 return sensedEntities;
532 } 532 }