Merge branch 'master' into careminster-presence-refactor

3 files changed, 10 insertions, 13 deletions

diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 916148b..64567db 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (permissionToDelete)
             {
                 foreach (SceneObjectGroup g in objectGroups)
-                    g.DeleteGroup(false);
+                    g.DeleteGroupFromScene(false);
             }
         }
         
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ac2246c..33e3e5d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2189,7 +2189,7 @@ namespace OpenSim.Region.Framework.Scenes
                 EventManager.TriggerParcelPrimCountTainted();
             }
 
-            group.DeleteGroup(silent);
+            group.DeleteGroupFromScene(silent);
 
 //            m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID);
         }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 52f6c1a..3411d18 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Diagnostics;
+using System.Linq;
 using System.Threading;
 using System.Xml;
 using System.Xml.Serialization;
@@ -1564,7 +1564,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// must be handled by the caller.
         /// 
         /// <param name="silent">If true then deletion is not broadcast to clients</param>
-        public void DeleteGroup(bool silent)
+        public void DeleteGroupFromScene(bool silent)
         {
             // We need to keep track of this state in case this group is still queued for backup.
             m_isDeleted = true;
@@ -1572,28 +1572,25 @@ namespace OpenSim.Region.Framework.Scenes
             DetachFromBackup();
 
             lockPartsForRead(true);
-            List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values);
+            List<SceneObjectPart> parts = new List<SceneObjectPart>(m_parts.Values);
             lockPartsForRead(false);
             
-            foreach (SceneObjectPart part in values)
+            foreach (SceneObjectPart part in parts)
             {
-//                    part.Inventory.RemoveScriptInstances();
-                
-                Scene.ForEachScenePresence(delegate (ScenePresence sp)
+                Scene.ForEachScenePresence(delegate (ScenePresence avatar)
                 {
-                    if (sp.ParentID == LocalId)
+                    if (avatar.ParentID == LocalId)
                     {
-                        sp.StandUp();
+                        avatar.StandUp();
                     }
 
                     if (!silent)
                     {
                         part.UpdateFlag = 0;
                         if (part == m_rootPart)
-                            sp.ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
+                            avatar.ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
                     }
                 });
-                
             }