From 21016800948df8c94fd6b75babbe7c384291b3ed Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 11 Dec 2008 01:03:53 +0000
Subject: Make object return actually use the CanReturnObject permission,
 rather than the CanDelete one.

---
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 586fa43..335f247 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1709,23 +1709,17 @@ namespace OpenSim.Region.Environment.Scenes
                         Permissions.CanDeleteObject(
                         grp.UUID,
                         remoteClient.AgentId);
-                permissionToDelete =
-                        Permissions.CanDeleteObject(
-                        grp.UUID,
-                        remoteClient.AgentId);
+                permissionToDelete = permissionToTake;
             }
             else if (action == DeRezAction.Return)
             {
                 if (remoteClient != null)
                 {
                     permissionToTake =
-                            Permissions.CanDeleteObject(
-                            grp.UUID,
-                            remoteClient.AgentId);
-                    permissionToDelete =
-                            Permissions.CanDeleteObject(
+                            Permissions.CanReturnObject(
                             grp.UUID,
                             remoteClient.AgentId);
+                    permissionToDelete = permissionToTake;
                     if (permissionToDelete)
                     {
                         AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return");
-- 
cgit v1.1