mirror of
https://github.com/opensim/opensim.git
synced 2026-08-08 02:05:34 +08:00
* 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.
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user