aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
2 files changed, 8 insertions, 3 deletions
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>