change CanDeedObject. WARNING like on other grids, if you do not set next owner rights on object and ALL ITS CONTENTS, you may loose all rights on it

1 files changed, 2 insertions, 11 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index ad913f7..3230a2b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2717,9 +2717,6 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (ownerID != UUID.Zero)
                     return;
-
-                if (!Permissions.CanDeedObject(remoteClient.AgentId, groupID))
-                    return;
             }
 
             List<SceneObjectGroup> groups = new List<SceneObjectGroup>();
@@ -2750,15 +2747,9 @@ namespace OpenSim.Region.Framework.Scenes
                         child.TriggerScriptChangedEvent(Changed.OWNER);
                     }
                 }
-                else // The object was deeded to the group
+                else // The object deeded to the group
                 {
-                    if (!Permissions.IsGod(remoteClient.AgentId) && sog.OwnerID != remoteClient.AgentId)
-                        continue;
-
-                    if (!Permissions.CanTransferObject(sog.UUID, groupID))
-                        continue;
-
-                    if (sog.GroupID != groupID)
+                    if (!Permissions.CanDeedObject(remoteClient, sog, groupID))
                         continue;
 
                     sog.SetOwnerId(groupID);