From 33aa7ba7dc19a37698d9a799d19a3d2e57b5115b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 14 Jul 2010 14:59:34 +0100
Subject: Revert "More on mantis #4869. This fixes the problem of objects
 showing up as no copy when they are copy-able. It works, but I have no idea
 what I'm doing." Cuauses a permission escalation. do NOT USE the preceding
 commit

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 142143b..34461dc 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -276,7 +276,6 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (UUID.Zero == transactionID)
                 {
-          
                     item.Name = itemUpd.Name;
                     item.Description = itemUpd.Description;
                     item.NextPermissions = itemUpd.NextPermissions & item.BasePermissions;
@@ -450,18 +449,12 @@ namespace OpenSim.Region.Framework.Scenes
                                           (uint)PermissionMask.Modify) != 0 ?
                                           true : false;
 
-                        bool isRootCopy = (item.CurrentPermissions &
-                                          (uint)PermissionMask.Copy) != 0 ?
-                                          true : false;
-
                         // Mask the owner perms to the folded perms
                         ownerPerms &= foldedPerms;
 
                         // If the root was mod, let the mask reflect that
                         if (isRootMod)
                             ownerPerms |= (uint)PermissionMask.Modify;
-                        if (isRootCopy)
-                            ownerPerms |= (uint)PermissionMask.Copy;
                     }
 
                     // These will be applied to the root prim at next rez.
-- 
cgit v1.1