aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
3 files changed, 4 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 218f2c5..5dfd3e0 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -107,8 +107,7 @@ namespace OpenSim.Region.Framework.Scenes
107 List<uint> killIDs = new List<uint>(); 107 List<uint> killIDs = new List<uint>();
108 108
109 foreach (SceneObjectGroup g in objectGroups) 109 foreach (SceneObjectGroup g in objectGroups)
110 { 110 { killIDs.Add(g.LocalId);
111 killIDs.Add(g.LocalId);
112 g.DeleteGroupFromScene(true); 111 g.DeleteGroupFromScene(true);
113 } 112 }
114 113
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 962e5e1..e668790 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3230,7 +3230,7 @@ namespace OpenSim.Region.Framework.Scenes
3230 delegate(IClientAPI client) 3230 delegate(IClientAPI client)
3231 { 3231 {
3232 //We can safely ignore null reference exceptions. It means the avatar is dead and cleaned up anyway 3232 //We can safely ignore null reference exceptions. It means the avatar is dead and cleaned up anyway
3233 try { client.SendKillObject(avatar.RegionHandle, new List<uint>() { avatar.LocalId}); } 3233 try { client.SendKillObject(avatar.RegionHandle, new List<uint> { avatar.LocalId }); }
3234 catch (NullReferenceException) { } 3234 catch (NullReferenceException) { }
3235 }); 3235 });
3236 3236
@@ -3310,11 +3310,7 @@ namespace OpenSim.Region.Framework.Scenes
3310 } 3310 }
3311 deleteIDs.Add(localID); 3311 deleteIDs.Add(localID);
3312 } 3312 }
3313 3313 ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, deleteIDs); });
3314 ForEachClient(delegate(IClientAPI client)
3315 {
3316 client.SendKillObject(m_regionHandle, deleteIDs);
3317 });
3318 } 3314 }
3319 3315
3320 #endregion 3316 #endregion
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6e20f90..a12a17c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1485,7 +1485,7 @@ namespace OpenSim.Region.Framework.Scenes
1485 { 1485 {
1486 if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) || 1486 if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) ||
1487 (AttachmentPoint < 31) || (AttachmentPoint > 38)) 1487 (AttachmentPoint < 31) || (AttachmentPoint > 38))
1488 avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint>() {part.LocalId}); 1488 avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint> { part.LocalId });
1489 } 1489 }
1490 } 1490 }
1491 }); 1491 });