Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2026-08-14 17:55:39 +08:00 · 2010-03-19 15:17:15 -07:00
parent 62e0b53ca4 e0289bb432
commit 5e65bef805
6 changed files with 112 additions and 102 deletions
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1518,9 +1518,10 @@ namespace OpenSim.Region.Framework.Scenes
                if (remoteClient != null)
                {
                    permissionToTake =
-                            Permissions.CanReturnObject(
-                            grp.UUID,
-                            remoteClient.AgentId);
+                            Permissions.CanReturnObjects(
+                                    null,
+                                    remoteClient.AgentId,
+                                    new List<SceneObjectGroup>() {grp});
                    permissionToDelete = permissionToTake;

                    if (permissionToDelete)