From ba36c62caad0fb88f89863c9e0afdefc4f2897cc Mon Sep 17 00:00:00 2001
From: Tom Grimshaw
Date: Wed, 19 May 2010 00:20:51 -0700
Subject: Fix a null reference issue in cmGetAvatarList()

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
index 07cba60..3e62c1a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             LSL_List result = new LSL_List();
             World.ForEachScenePresence(delegate (ScenePresence avatar)
             {
-                if (avatar.UUID != m_host.OwnerID)
+                if (avatar != null && avatar.UUID != m_host.OwnerID)
                 {
                     if (avatar.IsChildAgent == false)
                     {
-- 
cgit v1.1