aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-17 19:12:56 +0000
committerJustin Clarke Casey2008-12-17 19:12:56 +0000
commit2108d328df70c2156efecbd2211c8212843f62ff (patch)
treeabe7489aed3379286466fd6229648c38144a6c31 /OpenSim
parentChange the PacketQueue to use the stored size as well (diff)
downloadopensim-SC_OLD-2108d328df70c2156efecbd2211c8212843f62ff.zip
opensim-SC_OLD-2108d328df70c2156efecbd2211c8212843f62ff.tar.gz
opensim-SC_OLD-2108d328df70c2156efecbd2211c8212843f62ff.tar.bz2
opensim-SC_OLD-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')
-rw-r--r--OpenSim/Framework/IScene.cs5
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
3 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 5978245..d3c3843 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -80,7 +80,10 @@ namespace OpenSim.Framework
80 /// Used by ClientView when a 'kick everyone' or 'estate message' occurs 80 /// Used by ClientView when a 'kick everyone' or 'estate message' occurs
81 /// 81 ///
82 /// <param name="avatarID">AvatarID to lookup</param> 82 /// <param name="avatarID">AvatarID to lookup</param>
83 /// <returns>true if the presence is a child agent, false if the presence does not exist or is not a child agent</returns> 83 /// <returns>true if the presence is a child agent, false if the presence is a root exception</returns>
84 /// <exception cref="System.NullReferenceException">
85 /// Thrown if the agent does not exist.
86 /// </exception>
84 bool PresenceChildStatus(UUID agentId); 87 bool PresenceChildStatus(UUID agentId);
85 88
86 // Diva: get this out of here!!! 89 // Diva: get this out of here!!!
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index e34c8ec..9d6e3af 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -333,6 +333,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
333 333
334 if (m_groupPowers.ContainsKey(groupID)) 334 if (m_groupPowers.ContainsKey(groupID))
335 return m_groupPowers[groupID]; 335 return m_groupPowers[groupID];
336
336 return 0; 337 return 0;
337 } 338 }
338 339
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>