diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2aba2dd..8cdde3f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3480,7 +3480,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3480 | delegate(IClientAPI client) | 3480 | delegate(IClientAPI client) |
3481 | { | 3481 | { |
3482 | //We can safely ignore null reference exceptions. It means the avatar is dead and cleaned up anyway | 3482 | //We can safely ignore null reference exceptions. It means the avatar is dead and cleaned up anyway |
3483 | try { client.SendKillObject(avatar.RegionHandle, new List<uint> { avatar.LocalId }); } | 3483 | try { client.SendKillObject(new List<uint> { avatar.LocalId }); } |
3484 | catch (NullReferenceException) { } | 3484 | catch (NullReferenceException) { } |
3485 | }); | 3485 | }); |
3486 | } | 3486 | } |
@@ -3560,7 +3560,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3560 | } | 3560 | } |
3561 | deleteIDs.Add(localID); | 3561 | deleteIDs.Add(localID); |
3562 | } | 3562 | } |
3563 | ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, deleteIDs); }); | 3563 | |
3564 | ForEachClient(c => c.SendKillObject(deleteIDs)); | ||
3564 | } | 3565 | } |
3565 | 3566 | ||
3566 | #endregion | 3567 | #endregion |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 3b2f537..38fa26a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1247,7 +1247,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1247 | if (!IsAttachment | 1247 | if (!IsAttachment |
1248 | || AttachedAvatar == sp.UUID | 1248 | || AttachedAvatar == sp.UUID |
1249 | || !HasPrivateAttachmentPoint) | 1249 | || !HasPrivateAttachmentPoint) |
1250 | sp.ControllingClient.SendKillObject(m_regionHandle, new List<uint> { part.LocalId }); | 1250 | sp.ControllingClient.SendKillObject(new List<uint> { part.LocalId }); |
1251 | } | 1251 | } |
1252 | } | 1252 | } |
1253 | }); | 1253 | }); |