aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2017-06-26 20:55:44 +0100
committerUbitUmarov2017-06-26 20:55:44 +0100
commit5242853d684e2fbe81a28401809a19e3d57e1e51 (patch)
treefe741a25450031234a77809c09ac32786229c735 /OpenSim/Region
parentdont list deleted ones, that still don't know they are gone (diff)
downloadopensim-SC-5242853d684e2fbe81a28401809a19e3d57e1e51.zip
opensim-SC-5242853d684e2fbe81a28401809a19e3d57e1e51.tar.gz
opensim-SC-5242853d684e2fbe81a28401809a19e3d57e1e51.tar.bz2
opensim-SC-5242853d684e2fbe81a28401809a19e3d57e1e51.tar.xz
dont list deleted ones, that still don't know they are gone
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index ef511aa..f41f011 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -3824,7 +3824,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3824 LSL_List result = new LSL_List(); 3824 LSL_List result = new LSL_List();
3825 World.ForEachRootScenePresence(delegate (ScenePresence avatar) 3825 World.ForEachRootScenePresence(delegate (ScenePresence avatar)
3826 { 3826 {
3827 if (avatar != null && avatar.UUID != m_host.OwnerID) 3827 if (avatar != null && !avatar.IsDeleted && avatar.UUID != m_host.OwnerID )
3828 { 3828 {
3829 result.Add(new LSL_String(avatar.UUID.ToString())); 3829 result.Add(new LSL_String(avatar.UUID.ToString()));
3830 result.Add(new LSL_Vector(avatar.AbsolutePosition)); 3830 result.Add(new LSL_Vector(avatar.AbsolutePosition));
@@ -3844,7 +3844,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3844 World.ForEachRootScenePresence(delegate (ScenePresence avatar) 3844 World.ForEachRootScenePresence(delegate (ScenePresence avatar)
3845 { 3845 {
3846 // npcs are not childagents but that is now. 3846 // npcs are not childagents but that is now.
3847 if (avatar != null && avatar.IsNPC && !avatar.IsDeleted && !avatar.IsChildAgent) 3847 if (avatar != null && avatar.IsNPC && !avatar.IsDeleted && !avatar.IsChildAgent && !avatar.IsInTransit)
3848 { 3848 {
3849 result.Add(new LSL_String(avatar.UUID.ToString())); 3849 result.Add(new LSL_String(avatar.UUID.ToString()));
3850 result.Add(new LSL_Vector(avatar.AbsolutePosition)); 3850 result.Add(new LSL_Vector(avatar.AbsolutePosition));