diff options
author | Melanie | 2013-05-11 01:29:30 +0100 |
---|---|---|
committer | Melanie | 2013-05-11 01:29:30 +0100 |
commit | 55c9bc15e571065f66190e017f973f6e1ac43428 (patch) | |
tree | 537b8c95902bf343d8aeeef52a38124e0ba7e701 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Send up the part missing from the Avination Estate commit. (diff) | |
parent | BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie (diff) | |
download | opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.zip opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.gz opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.bz2 opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 1fa2fc7..80c4922 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 |