diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 5860c9a..1023e25 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3648,7 +3648,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3648 | delegate(IClientAPI client) | 3648 | delegate(IClientAPI client) |
3649 | { | 3649 | { |
3650 | //We can safely ignore null reference exceptions. It means the avatar is dead and cleaned up anyway | 3650 | //We can safely ignore null reference exceptions. It means the avatar is dead and cleaned up anyway |
3651 | try { client.SendKillObject(avatar.RegionHandle, new List<uint> { avatar.LocalId }); } | 3651 | try { client.SendKillObject(new List<uint> { avatar.LocalId }); } |
3652 | catch (NullReferenceException) { } | 3652 | catch (NullReferenceException) { } |
3653 | }); | 3653 | }); |
3654 | } | 3654 | } |
@@ -3729,7 +3729,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3729 | } | 3729 | } |
3730 | deleteIDs.Add(localID); | 3730 | deleteIDs.Add(localID); |
3731 | } | 3731 | } |
3732 | ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, deleteIDs); }); | 3732 | |
3733 | ForEachClient(c => c.SendKillObject(deleteIDs)); | ||
3733 | } | 3734 | } |
3734 | 3735 | ||
3735 | #endregion | 3736 | #endregion |
@@ -4382,8 +4383,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4382 | m_log.DebugFormat( | 4383 | m_log.DebugFormat( |
4383 | "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); | 4384 | "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); |
4384 | 4385 | ||
4385 | // XPTO: if this agent is not allowed here as root, always return false | ||
4386 | |||
4387 | // We have to wait until the viewer contacts this region after receiving EAC. | 4386 | // We have to wait until the viewer contacts this region after receiving EAC. |
4388 | // That calls AddNewClient, which finally creates the ScenePresence | 4387 | // That calls AddNewClient, which finally creates the ScenePresence |
4389 | int flags = GetUserFlags(cAgentData.AgentID); | 4388 | int flags = GetUserFlags(cAgentData.AgentID); |