diff options
author | Dan Lake | 2011-10-27 01:25:12 -0700 |
---|---|---|
committer | Dan Lake | 2011-10-27 01:25:12 -0700 |
commit | 06577d7299f38c342c9b241c691e647e5329837e (patch) | |
tree | e288b6229d18163507bf9ee6c8aaa23a7568b962 /OpenSim/Region/ScriptEngine/Shared/Api | |
parent | Added new ForEachRootScenePresence to Scene since almost every delegate passe... (diff) | |
download | opensim-SC-06577d7299f38c342c9b241c691e647e5329837e.zip opensim-SC-06577d7299f38c342c9b241c691e647e5329837e.tar.gz opensim-SC-06577d7299f38c342c9b241c691e647e5329837e.tar.bz2 opensim-SC-06577d7299f38c342c9b241c691e647e5329837e.tar.xz |
Continuation of previous checkin. Found more places where ForEachScenePresence can be changed to ForEachRootScenePresence.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 3cfc3c9..654f168 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -873,10 +873,9 @@ 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.ForEachScenePresence(delegate(ScenePresence sp) | 876 | World.ForEachRootScenePresence(delegate(ScenePresence sp) |
877 | { | 877 | { |
878 | if (!sp.IsChildAgent) | 878 | result.Add(new LSL_String(sp.Name)); |
879 | result.Add(new LSL_String(sp.Name)); | ||
880 | }); | 879 | }); |
881 | return result; | 880 | return result; |
882 | } | 881 | } |
@@ -2582,11 +2581,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2582 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); | 2581 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); |
2583 | if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID)) | 2582 | if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID)) |
2584 | { | 2583 | { |
2585 | World.ForEachScenePresence(delegate(ScenePresence sp) | 2584 | World.ForEachRootScenePresence(delegate(ScenePresence sp) |
2586 | { | 2585 | { |
2587 | if (!sp.IsChildAgent && | 2586 | if (sp.Firstname == FirstName && sp.Lastname == SurName) |
2588 | sp.Firstname == FirstName && | ||
2589 | sp.Lastname == SurName) | ||
2590 | { | 2587 | { |
2591 | // kick client... | 2588 | // kick client... |
2592 | if (alert != null) | 2589 | if (alert != null) |
@@ -2718,17 +2715,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2718 | CheckThreatLevel(ThreatLevel.None, "osGetAvatarList"); | 2715 | CheckThreatLevel(ThreatLevel.None, "osGetAvatarList"); |
2719 | 2716 | ||
2720 | LSL_List result = new LSL_List(); | 2717 | LSL_List result = new LSL_List(); |
2721 | World.ForEachScenePresence(delegate (ScenePresence avatar) | 2718 | World.ForEachRootScenePresence(delegate (ScenePresence avatar) |
2722 | { | 2719 | { |
2723 | if (avatar != null && avatar.UUID != m_host.OwnerID) | 2720 | if (avatar != null && avatar.UUID != m_host.OwnerID) |
2724 | { | 2721 | { |
2725 | if (avatar.IsChildAgent == false) | 2722 | result.Add(new LSL_String(avatar.UUID.ToString())); |
2726 | { | 2723 | OpenMetaverse.Vector3 ap = avatar.AbsolutePosition; |
2727 | result.Add(new LSL_String(avatar.UUID.ToString())); | 2724 | result.Add(new LSL_Vector(ap.X, ap.Y, ap.Z)); |
2728 | OpenMetaverse.Vector3 ap = avatar.AbsolutePosition; | 2725 | result.Add(new LSL_String(avatar.Name)); |
2729 | result.Add(new LSL_Vector(ap.X, ap.Y, ap.Z)); | ||
2730 | result.Add(new LSL_String(avatar.Name)); | ||
2731 | } | ||
2732 | } | 2726 | } |
2733 | }); | 2727 | }); |
2734 | 2728 | ||