* Committing half of patch mantis 001291 from Melanie! Thanks Melanie.

* Fixes perms on take-copy assuming you have a specific flag set..  which is still in discussion.

1 files changed, 13 insertions, 5 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index fb142f5..6aef45e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1094,12 +1094,20 @@ namespace OpenSim.Region.Environment.Scenes
                                 item.Folder = DeRezPacket.AgentBlock.DestinationID;
                                 if ((remoteClient.AgentId != objectGroup.RootPart.OwnerID) && ExternalChecks.ExternalChecksPropagatePermissions())
                                 {
-                                                                        objectGroup.ApplyNextOwnerPermissions();
-
-                                    item.BasePermissions = objectGroup.GetEffectivePermissions() & objectGroup.RootPart.NextOwnerMask;
-                                    item.CurrentPermissions = objectGroup.GetEffectivePermissions() & objectGroup.RootPart.NextOwnerMask;
-                                    item.NextPermissions = objectGroup.GetEffectivePermissions() & objectGroup.RootPart.NextOwnerMask;
+                                                                        uint perms=objectGroup.GetEffectivePermissions();
+                                                                        uint nextPerms=(perms & 7) << 13;
+                                                                        if((nextPerms & (uint)PermissionMask.Copy) == 0)
+                                                                                perms &= ~(uint)PermissionMask.Copy;
+                                                                        if((nextPerms & (uint)PermissionMask.Transfer) == 0)
+                                                                                perms &= ~(uint)PermissionMask.Transfer;
+                                                                        if((nextPerms & (uint)PermissionMask.Modify) == 0)
+                                                                                perms &= ~(uint)PermissionMask.Modify;
+
+                                    item.BasePermissions = perms & objectGroup.RootPart.NextOwnerMask;
+                                    item.CurrentPermissions = item.BasePermissions;
+                                    item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
                                                                         item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask;
+                                                                        item.CurrentPermissions |= 8; // Slam!
                                 }
                                 else
                                 {