diff options
author | Justin Clarke Casey | 2008-12-17 19:12:56 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-12-17 19:12:56 +0000 |
commit | 2108d328df70c2156efecbd2211c8212843f62ff (patch) | |
tree | abe7489aed3379286466fd6229648c38144a6c31 /OpenSim/Region/Environment/Scenes | |
parent | Change the PacketQueue to use the stored size as well (diff) | |
download | opensim-SC-2108d328df70c2156efecbd2211c8212843f62ff.zip opensim-SC-2108d328df70c2156efecbd2211c8212843f62ff.tar.gz opensim-SC-2108d328df70c2156efecbd2211c8212843f62ff.tar.bz2 opensim-SC-2108d328df70c2156efecbd2211c8212843f62ff.tar.xz |
* 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.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 10 |
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 | |||
4133 | { | 4133 | { |
4134 | ScenePresence cp = GetScenePresence(avatarID); | 4134 | ScenePresence cp = GetScenePresence(avatarID); |
4135 | 4135 | ||
4136 | if (cp != null) | 4136 | // FIXME: This is really crap - some logout code is relying on a NullReferenceException to halt its processing |
4137 | return cp.IsChildAgent; | 4137 | // This needs to be fixed properly by cleaning up the logout code. |
4138 | //if (cp != null) | ||
4139 | // return cp.IsChildAgent; | ||
4138 | 4140 | ||
4139 | return false; | 4141 | //return false; |
4142 | |||
4143 | return cp.IsChildAgent; | ||
4140 | } | 4144 | } |
4141 | 4145 | ||
4142 | /// <summary> | 4146 | /// <summary> |