* minor: Stop presence child status suffering an NRE if the agent uuid given is not represent at all

2 files changed, 14 insertions, 7 deletions

diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 63bf7ac..6a6fdf1 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -72,7 +72,15 @@ namespace OpenSim.Framework
 
         string GetSimulatorVersion();
 
-        bool PresenceChildStatus(UUID avatarID);
+        /// <summary>
+        /// Is the agent denoted by the given agentID a child presence in this scene?
+        /// </summary>
+        /// 
+        /// Used by ClientView when a 'kick everyone' or 'estate message' occurs
+        /// 
+        /// <param name="avatarID">AvatarID to lookup</param>
+        /// <returns>true if the presence is a child agent, false if the presence does not exist or is not a child agent</returns>        
+        bool PresenceChildStatus(UUID agentId);
 
         // Diva: get this out of here!!!
         string GetCapsPath(UUID agentId);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 9497043..873662e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -4130,15 +4130,14 @@ namespace OpenSim.Region.Environment.Scenes
             return m_sceneGraph.GetScenePresence(avatarID);
         }
 
-        /// <summary>
-        /// Request an Avatar's Child Status - used by ClientView when a 'kick everyone' or 'estate message' occurs
-        /// </summary>
-        /// <param name="avatarID">AvatarID to lookup</param>
-        /// <returns></returns>
         public override bool PresenceChildStatus(UUID avatarID)
         {
             ScenePresence cp = GetScenePresence(avatarID);
-            return cp.IsChildAgent;
+            
+            if (cp != null)
+                return cp.IsChildAgent;
+            
+            return false;
         }
 
         /// <summary>