From fc76b5f58950b747cfabec19a4349216a48c9c13 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Wed, 19 May 2010 00:24:54 -0700
Subject: [PATCH] Fix a null reference issue in cmGetAvatarList()

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

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
index 9f829da577..4f1e9f73e7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             LSL_List result = new LSL_List();
             foreach (ScenePresence avatar in World.GetAvatars())
             {
-                if (avatar.UUID != m_host.OwnerID)
+                if (avatar != null && avatar.UUID != m_host.OwnerID)
                 {
                     if (avatar.IsChildAgent == false)
                     {