Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 14 insertions, 14 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 9b5459d..1d8b988 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1697,14 +1697,14 @@ namespace OpenSim.Region.Framework.Scenes
             List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>();
             List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>();
 
-            // Start with true for both, then remove the flags if objects
-            // that we can't derez are part of the selection
-            bool permissionToTake = true;
-            bool permissionToTakeCopy = true;
-            bool permissionToDelete = true;
-
             foreach (uint localID in localIDs)
             {
+                // Start with true for both, then remove the flags if objects
+                // that we can't derez are part of the selection
+                bool permissionToTake = true;
+                bool permissionToTakeCopy = true;
+                bool permissionToDelete = true;
+
                 // Invalid id
                 SceneObjectPart part = GetSceneObjectPart(localID);
                 if (part == null)
@@ -1803,16 +1803,16 @@ namespace OpenSim.Region.Framework.Scenes
                         permissionToTake = true;
                         permissionToDelete = true;
                     }
+                }
 
-                    if (permissionToTake && (!permissionToDelete))
-                        takeGroups.Add(grp);
+                if (permissionToTake && (!permissionToDelete))
+                    takeGroups.Add(grp);
 
-                    if (permissionToDelete)
-                    {
-                        if (permissionToTake)
-                            deleteGroups.Add(grp);
-                        deleteIDs.Add(grp.LocalId);
-                    }
+                if (permissionToDelete)
+                {
+                    if (permissionToTake)
+                        deleteGroups.Add(grp);
+                    deleteIDs.Add(grp.LocalId);
                 }
             }