Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

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
                 List<uint> killIDs = new List<uint>();
 
                 foreach (SceneObjectGroup g in objectGroups)
-                {
-                    killIDs.Add(g.LocalId);
+                {   killIDs.Add(g.LocalId);
                     g.DeleteGroupFromScene(true);
                 }
 
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
                     delegate(IClientAPI client)
                     {
                         //We can safely ignore null reference exceptions.  It means the avatar is dead and cleaned up anyway
-                        try { client.SendKillObject(avatar.RegionHandle, new List<uint>() { avatar.LocalId}); }
+                        try { client.SendKillObject(avatar.RegionHandle, new List<uint> { avatar.LocalId }); }
                         catch (NullReferenceException) { }
                     });
 
@@ -3310,11 +3310,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 deleteIDs.Add(localID);
             }
-
-            ForEachClient(delegate(IClientAPI client)
-            {
-                    client.SendKillObject(m_regionHandle, deleteIDs);
-            });
+            ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, deleteIDs); });
         }
 
         #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
                         {
                             if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) || 
                                 (AttachmentPoint < 31) || (AttachmentPoint > 38))
-                                avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint>() {part.LocalId});
+                                avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint> { part.LocalId });
                         }
                     }
                 });