diff options
Added new ForEachRootScenePresence to Scene since almost every delegate passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 82701ce..83c3b78 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3723,9 +3723,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3723 | m_host.AddScriptLPS(1); | 3723 | m_host.AddScriptLPS(1); |
3724 | List<UUID> keytable = new List<UUID>(); | 3724 | List<UUID> keytable = new List<UUID>(); |
3725 | // parse for sitting avatare-uuids | 3725 | // parse for sitting avatare-uuids |
3726 | World.ForEachScenePresence(delegate(ScenePresence presence) | 3726 | World.ForEachRootScenePresence(delegate(ScenePresence presence) |
3727 | { | 3727 | { |
3728 | if (!presence.IsChildAgent && presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID)) | 3728 | if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID)) |
3729 | keytable.Add(presence.UUID); | 3729 | keytable.Add(presence.UUID); |
3730 | }); | 3730 | }); |
3731 | 3731 | ||
@@ -3785,9 +3785,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3785 | m_host.AddScriptLPS(1); | 3785 | m_host.AddScriptLPS(1); |
3786 | // parse for sitting avatare-names | 3786 | // parse for sitting avatare-names |
3787 | List<String> nametable = new List<String>(); | 3787 | List<String> nametable = new List<String>(); |
3788 | World.ForEachScenePresence(delegate(ScenePresence presence) | 3788 | World.ForEachRootScenePresence(delegate(ScenePresence presence) |
3789 | { | 3789 | { |
3790 | if (!presence.IsChildAgent && presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID)) | 3790 | if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID)) |
3791 | nametable.Add(presence.ControllingClient.Name); | 3791 | nametable.Add(presence.ControllingClient.Name); |
3792 | }); | 3792 | }); |
3793 | 3793 | ||
@@ -7568,9 +7568,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7568 | { | 7568 | { |
7569 | m_host.AddScriptLPS(1); | 7569 | m_host.AddScriptLPS(1); |
7570 | int avatarCount = 0; | 7570 | int avatarCount = 0; |
7571 | World.ForEachScenePresence(delegate(ScenePresence presence) | 7571 | World.ForEachRootScenePresence(delegate(ScenePresence presence) |
7572 | { | 7572 | { |
7573 | if (!presence.IsChildAgent && presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID)) | 7573 | if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID)) |
7574 | avatarCount++; | 7574 | avatarCount++; |
7575 | }); | 7575 | }); |
7576 | 7576 | ||
@@ -9336,9 +9336,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9336 | landObject.SetMediaUrl(url); | 9336 | landObject.SetMediaUrl(url); |
9337 | 9337 | ||
9338 | // now send to all (non-child) agents in the parcel | 9338 | // now send to all (non-child) agents in the parcel |
9339 | World.ForEachScenePresence(delegate(ScenePresence sp) | 9339 | World.ForEachRootScenePresence(delegate(ScenePresence sp) |
9340 | { | 9340 | { |
9341 | if (!sp.IsChildAgent && (sp.currentParcelUUID == landData.GlobalID)) | 9341 | if (sp.currentParcelUUID == landData.GlobalID) |
9342 | { | 9342 | { |
9343 | sp.ControllingClient.SendParcelMediaUpdate(landData.MediaURL, | 9343 | sp.ControllingClient.SendParcelMediaUpdate(landData.MediaURL, |
9344 | landData.MediaID, | 9344 | landData.MediaID, |
@@ -9369,9 +9369,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9369 | if (presence == null) | 9369 | if (presence == null) |
9370 | { | 9370 | { |
9371 | // send to all (non-child) agents in the parcel | 9371 | // send to all (non-child) agents in the parcel |
9372 | World.ForEachScenePresence(delegate(ScenePresence sp) | 9372 | World.ForEachRootScenePresence(delegate(ScenePresence sp) |
9373 | { | 9373 | { |
9374 | if (!sp.IsChildAgent && (sp.currentParcelUUID == landData.GlobalID)) | 9374 | if (sp.currentParcelUUID == landData.GlobalID) |
9375 | { | 9375 | { |
9376 | sp.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this? | 9376 | sp.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this? |
9377 | (ParcelMediaCommandEnum)commandToSend, | 9377 | (ParcelMediaCommandEnum)commandToSend, |