aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-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
3 files changed, 11 insertions, 11 deletions
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 }