aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2010-07-14 14:59:34 +0100
committerMelanie2010-07-14 14:59:34 +0100
commit33aa7ba7dc19a37698d9a799d19a3d2e57b5115b (patch)
tree298a39f2f4b54ce0274313f492a69613bcb7801a /OpenSim/Region/Framework
parentRemoved left-over debug messages. (diff)
downloadopensim-SC_OLD-33aa7ba7dc19a37698d9a799d19a3d2e57b5115b.zip
opensim-SC_OLD-33aa7ba7dc19a37698d9a799d19a3d2e57b5115b.tar.gz
opensim-SC_OLD-33aa7ba7dc19a37698d9a799d19a3d2e57b5115b.tar.bz2
opensim-SC_OLD-33aa7ba7dc19a37698d9a799d19a3d2e57b5115b.tar.xz
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
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs7
1 files changed, 0 insertions, 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
276 { 276 {
277 if (UUID.Zero == transactionID) 277 if (UUID.Zero == transactionID)
278 { 278 {
279
280 item.Name = itemUpd.Name; 279 item.Name = itemUpd.Name;
281 item.Description = itemUpd.Description; 280 item.Description = itemUpd.Description;
282 item.NextPermissions = itemUpd.NextPermissions & item.BasePermissions; 281 item.NextPermissions = itemUpd.NextPermissions & item.BasePermissions;
@@ -450,18 +449,12 @@ namespace OpenSim.Region.Framework.Scenes
450 (uint)PermissionMask.Modify) != 0 ? 449 (uint)PermissionMask.Modify) != 0 ?
451 true : false; 450 true : false;
452 451
453 bool isRootCopy = (item.CurrentPermissions &
454 (uint)PermissionMask.Copy) != 0 ?
455 true : false;
456
457 // Mask the owner perms to the folded perms 452 // Mask the owner perms to the folded perms
458 ownerPerms &= foldedPerms; 453 ownerPerms &= foldedPerms;
459 454
460 // If the root was mod, let the mask reflect that 455 // If the root was mod, let the mask reflect that
461 if (isRootMod) 456 if (isRootMod)
462 ownerPerms |= (uint)PermissionMask.Modify; 457 ownerPerms |= (uint)PermissionMask.Modify;
463 if (isRootCopy)
464 ownerPerms |= (uint)PermissionMask.Copy;
465 } 458 }
466 459
467 // These will be applied to the root prim at next rez. 460 // These will be applied to the root prim at next rez.