* revert r7724 so that PresenceChildStatus() starts throwing NRE's again

* apparantly logout code relies on this happening in certain circumstances.  Really, the root issue needs to be investigated.

1 files changed, 7 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 3aa2470..8dcd071 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -4133,10 +4133,14 @@ namespace OpenSim.Region.Environment.Scenes
         {
             ScenePresence cp = GetScenePresence(avatarID);
             
-            if (cp != null)
-                return cp.IsChildAgent;
+            // FIXME: This is really crap - some logout code is relying on a NullReferenceException to halt its processing
+            // This needs to be fixed properly by cleaning up the logout code.
+            //if (cp != null)
+            //    return cp.IsChildAgent;
             
-            return false;
+            //return false;
+            
+            return cp.IsChildAgent;
         }
 
         /// <summary>