diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 28 |
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 | |||
1697 | List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>(); | 1697 | List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>(); |
1698 | List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>(); | 1698 | List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>(); |
1699 | 1699 | ||
1700 | // Start with true for both, then remove the flags if objects | ||
1701 | // that we can't derez are part of the selection | ||
1702 | bool permissionToTake = true; | ||
1703 | bool permissionToTakeCopy = true; | ||
1704 | bool permissionToDelete = true; | ||
1705 | |||
1706 | foreach (uint localID in localIDs) | 1700 | foreach (uint localID in localIDs) |
1707 | { | 1701 | { |
1702 | // Start with true for both, then remove the flags if objects | ||
1703 | // that we can't derez are part of the selection | ||
1704 | bool permissionToTake = true; | ||
1705 | bool permissionToTakeCopy = true; | ||
1706 | bool permissionToDelete = true; | ||
1707 | |||
1708 | // Invalid id | 1708 | // Invalid id |
1709 | SceneObjectPart part = GetSceneObjectPart(localID); | 1709 | SceneObjectPart part = GetSceneObjectPart(localID); |
1710 | if (part == null) | 1710 | if (part == null) |
@@ -1803,16 +1803,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
1803 | permissionToTake = true; | 1803 | permissionToTake = true; |
1804 | permissionToDelete = true; | 1804 | permissionToDelete = true; |
1805 | } | 1805 | } |
1806 | } | ||
1806 | 1807 | ||
1807 | if (permissionToTake && (!permissionToDelete)) | 1808 | if (permissionToTake && (!permissionToDelete)) |
1808 | takeGroups.Add(grp); | 1809 | takeGroups.Add(grp); |
1809 | 1810 | ||
1810 | if (permissionToDelete) | 1811 | if (permissionToDelete) |
1811 | { | 1812 | { |
1812 | if (permissionToTake) | 1813 | if (permissionToTake) |
1813 | deleteGroups.Add(grp); | 1814 | deleteGroups.Add(grp); |
1814 | deleteIDs.Add(grp.LocalId); | 1815 | deleteIDs.Add(grp.LocalId); |
1815 | } | ||
1816 | } | 1816 | } |
1817 | } | 1817 | } |
1818 | 1818 | ||