42 files changed, 2300 insertions, 1557 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index eedba9d..ab6d58f 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Framework
    public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);
    public delegate void DeRezObject(
-        IClientAPI remoteClient, List<uint> localIDs, UUID groupID, DeRezAction action, UUID destinationID);
+        IClientAPI remoteClient, List<uint> localIDs, UUID groupID, DeRezAction action, UUID destinationID, bool AddToReturns = true);
    public delegate void GenericCall5(IClientAPI remoteClient, bool status);
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 99e97e8..7de8c52 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Framework
        private float m_physPrimMin = 0;
        private int m_physPrimMax = 0;
        private bool m_clampPrimSize = false;
-        private int m_objectCapacity = 0;
+        private int m_objectCapacity = 15000;
        private int m_maxPrimsPerUser = -1;
        private int m_linksetCapacity = 0;
        private string m_regionType = String.Empty;
@@ -753,7 +753,7 @@ namespace OpenSim.Framework
            m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
            allKeys.Remove("ClampPrimSize");
-            m_objectCapacity = config.GetInt("MaxPrims", 15000);
+            m_objectCapacity = config.GetInt("MaxPrims", m_objectCapacity);
            allKeys.Remove("MaxPrims");
            m_maxPrimsPerUser = config.GetInt("MaxPrimsPerUser", -1);
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index dcb660a..0ec24e6 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -80,15 +80,17 @@ namespace OpenSim.Framework
        FoldedMask = 0x0f,
        //
-        Transfer = 1 << 13,
+        Transfer = 1 << 13, // 0x02000
-        Modify = 1 << 14,
+        Modify = 1 << 14,   // 0x04000
-        Copy = 1 << 15,
+        Copy = 1 << 15,     // 0x08000
-        Export = 1 << 16,
+        Export = 1 << 16,   // 0x10000
-        Move = 1 << 19,
+        Move = 1 << 19,     // 0x80000
-        Damage = 1 << 20,
+        Damage = 1 << 20,   // 0x100000 does not seem to be in use
        // All does not contain Export, which is special and must be
        // explicitly given
-        All = (1 << 13) | (1 << 14) | (1 << 15) | (1 << 19)
+        All = 0x8e000,
+        AllAndExport = 0x9e000,
+        AllEffective = 0x9e000
    }
    /// <summary>
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 34a9246..168836c 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -461,15 +461,14 @@ namespace OpenSim
            while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null)
                SetUpEstateOwner(scene);
+            scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
            // Prims have to be loaded after module configuration since some modules may be invoked during the load
            scene.LoadPrimsFromStorage(regionInfo.originRegionID);
            // TODO : Try setting resource for region xstats here on scene
            MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo));
-            scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
-            scene.EventManager.TriggerParcelPrimCountUpdate();
            if (scene.SnmpService != null)
            {
                scene.SnmpService.BootInfo("Grid Registration in progress", scene);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
index 189fa36..69fcb7d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
@@ -121,6 +121,9 @@ namespace OpenSim.Region.ClientStack.Linden
            OSD r = OSDParser.DeserializeLLSDXml((string)request["requestbody"]);
+            if (r.Type != OSDType.Map) // not a proper req
+                return responsedata;
            //UUID session_id = UUID.Zero;
            bool bypass_raycast = false;
            uint everyone_mask = 0;
@@ -157,9 +160,6 @@ namespace OpenSim.Region.ClientStack.Linden
            int state = 0;
            int lastattach = 0;
-            if (r.Type != OSDType.Map) // not a proper req
-                return responsedata;
            OSDMap rm = (OSDMap)r;
            if (rm.ContainsKey("ObjectData")) //v2
@@ -307,8 +307,6 @@ namespace OpenSim.Region.ClientStack.Linden
                }
            }
            Vector3 pos = m_scene.GetNewRezLocation(ray_start, ray_end, ray_target_id, rotation, (bypass_raycast) ? (byte)1 : (byte)0, (ray_end_is_intersection) ? (byte)1 : (byte)0, true, scale, false);
            PrimitiveBaseShape pbs = PrimitiveBaseShape.CreateBox();
@@ -359,6 +357,8 @@ namespace OpenSim.Region.ClientStack.Linden
            rootpart.NextOwnerMask = next_owner_mask;
            rootpart.Material = (byte)material;
+            obj.AggregatePerms();
            m_scene.PhysicsScene.AddPhysicsActorTaint(rootpart.PhysActor);
            responsedata["int_response_code"] = 200; //501; //410; //404;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
index 6874662..116c51f 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
@@ -335,6 +335,7 @@ namespace OpenSim.Region.ClientStack.Linden
                grp.AbsolutePosition = obj.Position;
                prim.RotationOffset = obj.Rotation;
                // Required for linking
                grp.RootPart.ClearUpdateSchedule();
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 8ba1ba3..410ac00 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5731,28 +5731,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        }
 //        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(SceneObjectPart data, UUID recipientID)
-        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(SceneObjectPart data, ScenePresence sp)
+        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(SceneObjectPart part, ScenePresence sp)
        {
            byte[] objectData = new byte[60];
-            data.RelativePosition.ToBytes(objectData, 0);
+            part.RelativePosition.ToBytes(objectData, 0);
-            data.Velocity.ToBytes(objectData, 12);
+            part.Velocity.ToBytes(objectData, 12);
-            data.Acceleration.ToBytes(objectData, 24);
+            part.Acceleration.ToBytes(objectData, 24);
-            Quaternion rotation = data.RotationOffset;
+            Quaternion rotation = part.RotationOffset;
            rotation.Normalize();
            rotation.ToBytes(objectData, 36);
-            data.AngularVelocity.ToBytes(objectData, 48);
+            part.AngularVelocity.ToBytes(objectData, 48);
            ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
-            update.ClickAction = (byte)data.ClickAction;
+            update.ClickAction = (byte)part.ClickAction;
            update.CRC = 0;
-            update.ExtraParams = data.Shape.ExtraParams ?? Utils.EmptyBytes;
+            update.ExtraParams = part.Shape.ExtraParams ?? Utils.EmptyBytes;
-            update.FullID = data.UUID;
+            update.FullID = part.UUID;
-            update.ID = data.LocalId;
+            update.ID = part.LocalId;
            //update.JointAxisOrAnchor = Vector3.Zero; // These are deprecated
            //update.JointPivot = Vector3.Zero;
            //update.JointType = 0;
-            update.Material = data.Material;
+            update.Material = part.Material;
            update.MediaURL = Utils.EmptyBytes; // FIXME: Support this in OpenSim
 /*
            if (data.ParentGroup.IsAttachment)
@@ -5781,68 +5781,68 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            }
 */
-            if (data.ParentGroup.IsAttachment)
+            if (part.ParentGroup.IsAttachment)
            {
-                if (data.IsRoot)
+                if (part.IsRoot)
                {
-                    update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.ParentGroup.FromItemID);
+                    update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + part.ParentGroup.FromItemID);
                }
                else
                    update.NameValue = Utils.EmptyBytes;
-                int st = (int)data.ParentGroup.AttachmentPoint;
+                int st = (int)part.ParentGroup.AttachmentPoint;
                update.State = (byte)(((st & 0xf0) >> 4) + ((st & 0x0f) << 4)); ;
            }
            else
            {
                update.NameValue = Utils.EmptyBytes;
-                update.State = data.Shape.State; // not sure about this
+                update.State = part.Shape.State; // not sure about this
            }
            update.ObjectData = objectData;
-            update.ParentID = data.ParentID;
+            update.ParentID = part.ParentID;
-            update.PathBegin = data.Shape.PathBegin;
+            update.PathBegin = part.Shape.PathBegin;
-            update.PathCurve = data.Shape.PathCurve;
+            update.PathCurve = part.Shape.PathCurve;
-            update.PathEnd = data.Shape.PathEnd;
+            update.PathEnd = part.Shape.PathEnd;
-            update.PathRadiusOffset = data.Shape.PathRadiusOffset;
+            update.PathRadiusOffset = part.Shape.PathRadiusOffset;
-            update.PathRevolutions = data.Shape.PathRevolutions;
+            update.PathRevolutions = part.Shape.PathRevolutions;
-            update.PathScaleX = data.Shape.PathScaleX;
+            update.PathScaleX = part.Shape.PathScaleX;
-            update.PathScaleY = data.Shape.PathScaleY;
+            update.PathScaleY = part.Shape.PathScaleY;
-            update.PathShearX = data.Shape.PathShearX;
+            update.PathShearX = part.Shape.PathShearX;
-            update.PathShearY = data.Shape.PathShearY;
+            update.PathShearY = part.Shape.PathShearY;
-            update.PathSkew = data.Shape.PathSkew;
+            update.PathSkew = part.Shape.PathSkew;
-            update.PathTaperX = data.Shape.PathTaperX;
+            update.PathTaperX = part.Shape.PathTaperX;
-            update.PathTaperY = data.Shape.PathTaperY;
+            update.PathTaperY = part.Shape.PathTaperY;
-            update.PathTwist = data.Shape.PathTwist;
+            update.PathTwist = part.Shape.PathTwist;
-            update.PathTwistBegin = data.Shape.PathTwistBegin;
+            update.PathTwistBegin = part.Shape.PathTwistBegin;
-            update.PCode = data.Shape.PCode;
+            update.PCode = part.Shape.PCode;
-            update.ProfileBegin = data.Shape.ProfileBegin;
+            update.ProfileBegin = part.Shape.ProfileBegin;
-            update.ProfileCurve = data.Shape.ProfileCurve;
+            update.ProfileCurve = part.Shape.ProfileCurve;
-            update.ProfileEnd = data.Shape.ProfileEnd;
+            update.ProfileEnd = part.Shape.ProfileEnd;
-            update.ProfileHollow = data.Shape.ProfileHollow;
+            update.ProfileHollow = part.Shape.ProfileHollow;
-            update.PSBlock = data.ParticleSystem ?? Utils.EmptyBytes;
+            update.PSBlock = part.ParticleSystem ?? Utils.EmptyBytes;
-            update.TextColor = data.GetTextColor().GetBytes(false);
+            update.TextColor = part.GetTextColor().GetBytes(false);
-            update.TextureAnim = data.TextureAnimation ?? Utils.EmptyBytes;
+            update.TextureAnim = part.TextureAnimation ?? Utils.EmptyBytes;
-            update.TextureEntry = data.Shape.TextureEntry ?? Utils.EmptyBytes;
+            update.TextureEntry = part.Shape.TextureEntry ?? Utils.EmptyBytes;
-            update.Scale = data.Shape.Scale;
+            update.Scale = part.Shape.Scale;
-            update.Text = Util.StringToBytes256(data.Text);
+            update.Text = Util.StringToBytes256(part.Text);
-            update.MediaURL = Util.StringToBytes256(data.MediaUrl);
+            update.MediaURL = Util.StringToBytes256(part.MediaUrl);
            #region PrimFlags
-            PrimFlags flags = (PrimFlags)m_scene.Permissions.GenerateClientFlags(sp, data.UUID);
+            PrimFlags flags = (PrimFlags)m_scene.Permissions.GenerateClientFlags(part, sp);
            // Don't send the CreateSelected flag to everyone
            flags &= ~PrimFlags.CreateSelected;
-            if (sp.UUID == data.OwnerID)
+            if (sp.UUID == part.OwnerID)
            {
-                if (data.CreateSelected)
+                if (part.CreateSelected)
                {
                    // Only send this flag once, then unset it
                    flags |= PrimFlags.CreateSelected;
-                    data.CreateSelected = false;
+                    part.CreateSelected = false;
                }
            }
@@ -5854,21 +5854,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            #endregion PrimFlags
-            if (data.Sound != UUID.Zero)
+            if (part.Sound != UUID.Zero)
            {
-                update.Sound = data.Sound;
+                update.Sound = part.Sound;
-                update.OwnerID = data.OwnerID;
+                update.OwnerID = part.OwnerID;
-                update.Gain = (float)data.SoundGain;
+                update.Gain = (float)part.SoundGain;
-                update.Radius = (float)data.SoundRadius;
+                update.Radius = (float)part.SoundRadius;
-                update.Flags = data.SoundFlags;
+                update.Flags = part.SoundFlags;
            }
-            switch ((PCode)data.Shape.PCode)
+            switch ((PCode)part.Shape.PCode)
            {
                case PCode.Grass:
                case PCode.Tree:
                case PCode.NewTree:
-                    update.Data = new byte[] { data.Shape.State };
+                    update.Data = new byte[] { part.Shape.State };
                    break;
                default:
                    update.Data = Utils.EmptyBytes;
@@ -7758,10 +7758,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            ObjectDuplicate handlerObjectDuplicate = null;
-            for (int i = 0; i < dupe.ObjectData.Length; i++)
+            handlerObjectDuplicate = OnObjectDuplicate;
+            if (handlerObjectDuplicate != null)
            {
-                handlerObjectDuplicate = OnObjectDuplicate;
+                for (int i = 0; i < dupe.ObjectData.Length; i++)
-                if (handlerObjectDuplicate != null)
                {
                    UUID rezGroupID = dupe.AgentData.GroupID;
                    if(!IsGroupMember(rezGroupID))
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 8b8ac20..cf188aa 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -481,14 +481,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 //                    "[ATTACHMENTS MODULE]: Attaching object {0} {1} to {2} point {3} from ground (silent = {4})",
 //                    group.Name, group.LocalId, sp.Name, attachmentPt, silent);
-            if (sp.GetAttachments().Contains(group))
-            {
-//                m_log.WarnFormat(
-//                    "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since it's already attached",
-//                    group.Name, group.LocalId, sp.Name, AttachmentPt);
-                return false;
-            }
            if (group.GetSittingAvatarsCount() != 0)
            {
@@ -500,6 +492,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                return false;
            }
+            List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt);
+            if (attachments.Contains(group))
+            {
+//                if (DebugLevel > 0)
+//                    m_log.WarnFormat(
+//                        "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since it's already attached",
+//                        group.Name, group.LocalId, sp.Name, attachmentPt);
+                return false;
+            }
            Vector3 attachPos = group.AbsolutePosition;
            // TODO: this short circuits multiple attachments functionality  in  LL viewer 2.1+ and should
@@ -533,7 +536,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
            {
                attachmentPt = (uint)group.RootPart.Shape.LastAttachPoint;
                attachPos = group.RootPart.AttachedPos;
-                group.HasGroupChanged = true;
            }
            // if we still didn't find a suitable attachment point.......
@@ -544,18 +546,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                attachPos = Vector3.Zero;
            }
-            List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt);
-            if (attachments.Contains(group))
-            {
-                if (DebugLevel > 0)
-                    m_log.WarnFormat(
-                        "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since it's already attached",
-                        group.Name, group.LocalId, sp.Name, attachmentPt);
-                return false;
-            }
            // If we already have 5, remove the oldest until only 4 are left. Skip over temp ones
            while (attachments.Count >= 5)
            {
@@ -579,7 +569,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
            lock (sp.AttachmentsSyncLock)
            {
                group.AttachmentPoint = attachmentPt;
-                group.AbsolutePosition = attachPos;
+                group.RootPart.AttachedPos = attachPos;
                if (addToInventory && sp.PresenceType != PresenceType.Npc)
                    UpdateUserInventoryWithAttachment(sp, group, attachmentPt, append);
@@ -956,7 +946,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
            m_scene.DeleteFromStorage(so.UUID);
            m_scene.EventManager.TriggerParcelPrimCountTainted();
-            so.AttachedAvatar = sp.UUID;
            foreach (SceneObjectPart part in so.Parts)
            {
@@ -969,11 +958,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                }
            }
-            so.AbsolutePosition = attachOffset;
-            so.RootPart.AttachedPos = attachOffset;
-            so.IsAttachment = true;
            so.RootPart.SetParentLocalId(sp.LocalId);
+            so.AttachedAvatar = sp.UUID;
            so.AttachmentPoint = attachmentpoint;
+            so.RootPart.AttachedPos = attachOffset;
+            so.AbsolutePosition = attachOffset;
+            so.IsAttachment = true;
            sp.AddAttachment(so);
@@ -1322,7 +1312,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                if (part == null)
                    return;
-                if (!m_scene.Permissions.CanTakeObject(part.UUID, remoteClient.AgentId))
+                SceneObjectGroup group = part.ParentGroup;
+                if (!m_scene.Permissions.CanTakeObject(group, sp))
                {
                    remoteClient.SendAgentAlertMessage(
                        "You don't have sufficient permissions to attach this object", false);
@@ -1334,7 +1326,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                AttachmentPt &= 0x7f;
                // Calls attach with a Zero position
-                SceneObjectGroup group = part.ParentGroup;
                if (AttachObject(sp, group , AttachmentPt, false, true, append))
                {
                    if (DebugLevel > 0)
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 297346a..315ce1b 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private bool enabled = true;
+        private bool m_UseNewAvnCode = false;
        private List<Scene> m_SceneList = new List<Scene>();
        private string m_RestURL = String.Empty;
        IMessageTransferModule m_TransferModule = null;
@@ -82,6 +83,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            }
            m_ForwardOfflineGroupMessages = cnf.GetBoolean("ForwardOfflineGroupMessages", m_ForwardOfflineGroupMessages);
+            m_UseNewAvnCode = cnf.GetBoolean("UseNewAvnCode", m_UseNewAvnCode);
        }
        public void AddRegion(Scene scene)
@@ -244,51 +246,72 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                    return;
            }
-            Scene scene = FindScene(new UUID(im.fromAgentID));
+            if(m_UseNewAvnCode)
-            if (scene == null)
+            {
-                scene = m_SceneList[0];
+                Scene scene = FindScene(new UUID(im.fromAgentID));
+                if (scene == null)
+                    scene = m_SceneList[0];
-            SendReply reply = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, SendReply>(
+                UUID scopeID = scene.RegionInfo.ScopeID;
-                    "POST", m_RestURL+"/SaveMessage/?scope=" +
+                SendReply reply = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, SendReply>(
-                    scene.RegionInfo.ScopeID.ToString(), im);
+                    "POST", m_RestURL+"/SaveMessage/?scope=" + scopeID.ToString(), im, 20000);
-            if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
+                if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
-            {
+                {
-                IClientAPI client = FindClient(new UUID(im.fromAgentID));
+                    IClientAPI client = FindClient(new UUID(im.fromAgentID));
-                if (client == null)
+                    if (client == null)
-                    return;
+                        return;
-                if (reply.Message == String.Empty)
+                    if (string.IsNullOrEmpty(reply.Message))
-                    reply.Message = "User is not logged in. " + (reply.Success ? "Message saved." : "Message not saved");
+                        reply.Message = "User is not logged in. " + (reply.Success ? "Message saved." : "Message not saved");
-                bool sendReply = true;
+                    bool sendReply = true;
-                switch (reply.Disposition)
+                    switch (reply.Disposition)
-                {
-                case 0: // Normal
-                    break;
-                case 1: // Only once per user
-                    if (m_repliesSent.ContainsKey(client) && m_repliesSent[client].Contains(new UUID(im.toAgentID)))
                    {
-                        sendReply = false;
+                        case 0: // Normal
+                            break;
+                        case 1: // Only once per user
+                           if (m_repliesSent.ContainsKey(client) && m_repliesSent[client].Contains(new UUID(im.toAgentID)))
+                                sendReply = false;
+                            else
+                            {
+                                if (!m_repliesSent.ContainsKey(client))
+                                    m_repliesSent[client] = new List<UUID>();
+                                m_repliesSent[client].Add(new UUID(im.toAgentID));
+                            }
+                            break;
                    }
-                    else
+                    if (sendReply)
                    {
-                        if (!m_repliesSent.ContainsKey(client))
+                        client.SendInstantMessage(new GridInstantMessage(
-                            m_repliesSent[client] = new List<UUID>();
+                                null, new UUID(im.toAgentID),
-                        m_repliesSent[client].Add(new UUID(im.toAgentID));
+                                "System", new UUID(im.fromAgentID),
+                                (byte)InstantMessageDialog.MessageFromAgent,
+                                reply.Message,
+                                false, new Vector3()));
                    }
-                    break;
                }
+            }
+            else
+            {
+                bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>(
+                    "POST", m_RestURL+"/SaveMessage/", im, 20000);
-                if (sendReply)
+                if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
                {
+                    IClientAPI client = FindClient(new UUID(im.fromAgentID));
+                    if (client == null)
+                        return;
                    client.SendInstantMessage(new GridInstantMessage(
-                            null, new UUID(im.toAgentID),
+                        null, new UUID(im.toAgentID),
-                            "System", new UUID(im.fromAgentID),
+                        "System", new UUID(im.fromAgentID),
-                            (byte)InstantMessageDialog.MessageFromAgent,
+                        (byte)InstantMessageDialog.MessageFromAgent,
-                            reply.Message,
+                        "User is not logged in. "+
-                            false, new Vector3()));
+                        (success ? "Message saved." : "Message not saved"),
+                        false, new Vector3()));
                }
            }
        }
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 6dc982b..92485a1 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -2620,7 +2620,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            {
                // FIXME: It would be better to never add the scene object at all rather than add it and then delete
                // it
-                if (!Scene.Permissions.CanObjectEntry(so.UUID, true, so.AbsolutePosition))
+                if (!Scene.Permissions.CanObjectEntry(so, true, so.AbsolutePosition))
                {
                    // Deny non attachments based on parcel settings
                    //
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 95e7456..ba3a7c9 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -541,16 +541,17 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
        #region Permissions
-        private bool CanTakeObject(UUID objectID, UUID stealer, Scene scene)
+        private bool CanTakeObject(SceneObjectGroup sog, ScenePresence sp)
        {
            if (m_bypassPermissions) return true;
-            if (!m_OutboundPermission && !UserManagementModule.IsLocalGridUser(stealer))
+            if(sp == null || sog == null)
+                return false;
+            if (!m_OutboundPermission && !UserManagementModule.IsLocalGridUser(sp.UUID))
            {
-                SceneObjectGroup sog = null;
+                if (sog.OwnerID == sp.UUID)
-                if (m_Scene.TryGetSceneObjectGroup(objectID, out sog) && sog.OwnerID == stealer)
                    return true;
                return false;
            }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index b37744d..67c847b 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -427,20 +427,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                originalRotations[objectGroup.UUID] = inventoryStoredRotation;
                // Restore attachment data after trip through the sim
-                if (objectGroup.RootPart.AttachPoint > 0)
+                if (objectGroup.AttachmentPoint > 0)
                {
                    inventoryStoredPosition = objectGroup.RootPart.AttachedPos;
                    inventoryStoredRotation = objectGroup.RootPart.AttachRotation;
-                }
+                    if (objectGroup.RootPart.Shape.PCode != (byte) PCode.Tree &&
+                            objectGroup.RootPart.Shape.PCode != (byte) PCode.NewTree)
+                        objectGroup.RootPart.Shape.LastAttachPoint = (byte)objectGroup.AttachmentPoint;
-                // Trees could be attached and it's been done, but it makes
-                // no sense. State must be preserved because it's the tree type
-                if (objectGroup.RootPart.Shape.PCode != (byte) PCode.Tree &&
-                    objectGroup.RootPart.Shape.PCode != (byte) PCode.NewTree)
-                {
-                    objectGroup.RootPart.Shape.State = objectGroup.RootPart.AttachPoint;
-                    if (objectGroup.RootPart.AttachPoint > 0)
-                        objectGroup.RootPart.Shape.LastAttachPoint = objectGroup.RootPart.AttachPoint;
                }
                objectGroup.AbsolutePosition = inventoryStoredPosition;
@@ -1139,8 +1133,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                        foreach (SceneObjectPart part in so.Parts)
                        {
                            part.GroupMask = 0; // DO NOT propagate here
+                            if( part.OwnerID != part.GroupID)
-                            part.LastOwnerID = part.OwnerID;
+                                part.LastOwnerID = part.OwnerID;
                            part.OwnerID = item.Owner;
                            part.RezzerID = item.Owner;
                            part.Inventory.ChangeInventoryOwner(item.Owner);
@@ -1180,6 +1174,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                                part.NextOwnerMask = item.NextPermissions & part.BaseMask;
                            }
                        }
                    }
                }
                else
@@ -1198,6 +1193,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                }
                rootPart.TrimPermissions();
+                so.AggregateDeepPerms();
                if (isAttachment)
                    so.FromItemID = item.ID;
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 5d12f8b..53b9796 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -149,9 +149,11 @@ namespace OpenSim.Region.CoreModules.World.Land
            parcelInfoCache.Size = 30; // the number of different parcel requests in this region to cache
            parcelInfoCache.DefaultTTL = new TimeSpan(0, 5, 0);
+            m_scene.EventManager.OnObjectAddedToScene += EventManagerOnParcelPrimCountAdd;
            m_scene.EventManager.OnParcelPrimCountAdd += EventManagerOnParcelPrimCountAdd;
-            m_scene.EventManager.OnParcelPrimCountUpdate += EventManagerOnParcelPrimCountUpdate;
            m_scene.EventManager.OnObjectBeingRemovedFromScene += EventManagerOnObjectBeingRemovedFromScene;
+            m_scene.EventManager.OnParcelPrimCountUpdate += EventManagerOnParcelPrimCountUpdate;
            m_scene.EventManager.OnRequestParcelPrimCountUpdate += EventManagerOnRequestParcelPrimCountUpdate;
            m_scene.EventManager.OnAvatarEnteringNewParcel += EventManagerOnAvatarEnteringNewParcel;
@@ -287,8 +289,10 @@ namespace OpenSim.Region.CoreModules.World.Land
            fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0,
                                            (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY));
-            fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+            LandData ldata = fullSimParcel.LandData;
-            fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch();
+            ldata.SimwideArea = ldata.Area;
+            ldata.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+            ldata.ClaimDate = Util.UnixTimeSinceEpoch();
            return AddLandObject(fullSimParcel);
        }
@@ -813,6 +817,9 @@ namespace OpenSim.Region.CoreModules.World.Land
                    throw new Exception("Error: Parcel not found at point " + x + ", " + y);
            }
+            if(m_landList.Count == 0  || m_landIDList == null)
+                return null;
            lock (m_landIDList)
            {
                try
@@ -824,8 +831,6 @@ namespace OpenSim.Region.CoreModules.World.Land
                        return null;
                }
            }
-            return m_landList[m_landIDList[x / 4, y / 4]];
        }
        // Create a 'parcel is here' bitmap for the parcel identified by the passed landID
@@ -1576,6 +1581,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                        }
                    }
                }
+                FinalizeLandPrimCountUpdate(); // update simarea information
            }
        }
@@ -1640,9 +1646,9 @@ namespace OpenSim.Region.CoreModules.World.Land
                foreach (HashSet<SceneObjectGroup> objs in returns.Values)
                {
                    List<SceneObjectGroup> objs2 = new List<SceneObjectGroup>(objs);
-                    if (m_scene.Permissions.CanReturnObjects(null, remoteClient.AgentId, objs2))
+                    if (m_scene.Permissions.CanReturnObjects(null, remoteClient, objs2))
                    {
-                        m_scene.returnObjects(objs2.ToArray(), remoteClient.AgentId);
+                        m_scene.returnObjects(objs2.ToArray(), remoteClient);
                    }
                    else
                    {
@@ -2035,7 +2041,7 @@ namespace OpenSim.Region.CoreModules.World.Land
        {
            SceneObjectGroup[] objs = new SceneObjectGroup[1];
            objs[0] = obj;
-            ((Scene)client.Scene).returnObjects(objs, client.AgentId);
+            ((Scene)client.Scene).returnObjects(objs, client);
        }
        Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>();
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 73b4cb5..2b5cb31 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -356,6 +356,7 @@ namespace OpenSim.Region.CoreModules.World.Land
            }
        }
+        // the total prims a parcel owner can have on a region
        public int GetSimulatorMaxPrimCount()
        {
            if (overrideSimulatorMaxPrimCount != null)
@@ -370,7 +371,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                                    * (double)m_scene.RegionInfo.RegionSettings.ObjectBonus
                                    / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY)
                                    +0.5 );
+                // sanity check
                if(simMax > m_scene.RegionInfo.ObjectCapacity)
                    simMax = m_scene.RegionInfo.ObjectCapacity;
                 //m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}, SimWidePrims {3}",
@@ -1043,7 +1044,8 @@ namespace OpenSim.Region.CoreModules.World.Land
            else
                LandData.AABBMax = new Vector3(tx, ty, (float)m_scene.Heightmap[tx - 1, ty - 1]);
-            LandData.Area = tempArea * landUnit * landUnit;
+            tempArea *= landUnit * landUnit;
+            LandData.Area = tempArea;
        }
        #endregion
@@ -1647,8 +1649,7 @@ namespace OpenSim.Region.CoreModules.World.Land
            {
                foreach (SceneObjectGroup obj in primsOverMe)
                {
-                    if (obj.OwnerID == previousOwner && obj.GroupID == UUID.Zero &&
+                    if(m_scene.Permissions.CanSellObject(previousOwner,obj, (byte)SaleType.Original))
-                        (obj.GetEffectivePermissions() & (uint)(OpenSim.Framework.PermissionMask.Transfer)) != 0)
                        m_BuySellModule.BuyObject(sp.ControllingClient, UUID.Zero, obj.LocalId, 1, 0);
                }
            }
@@ -1662,7 +1663,7 @@ namespace OpenSim.Region.CoreModules.World.Land
        {
            SceneObjectGroup[] objs = new SceneObjectGroup[1];
            objs[0] = obj;
-            m_scene.returnObjects(objs, obj.OwnerID);
+            m_scene.returnObjects(objs, null);
        }
        public void ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client)
@@ -1693,6 +1694,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                    {
                        if (obj.GroupID == LandData.GroupID)
                        {
+                            if (obj.OwnerID == LandData.OwnerID)
+                                continue;
                            if (!returns.ContainsKey(obj.OwnerID))
                                returns[obj.OwnerID] =
                                        new List<SceneObjectGroup>();
@@ -1734,8 +1737,8 @@ namespace OpenSim.Region.CoreModules.World.Land
            foreach (List<SceneObjectGroup> ol in returns.Values)
            {
-                if (m_scene.Permissions.CanReturnObjects(this, remote_client.AgentId, ol))
+                if (m_scene.Permissions.CanReturnObjects(this, remote_client, ol))
-                    m_scene.returnObjects(ol.ToArray(), remote_client.AgentId);
+                    m_scene.returnObjects(ol.ToArray(), remote_client);
            }
        }
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
index 857f919..2a720db 100644
--- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
@@ -92,10 +92,8 @@ namespace OpenSim.Region.CoreModules.World.Land
            m_Scene.RegisterModuleInterface<IPrimCountModule>(this);
            m_Scene.EventManager.OnObjectAddedToScene += OnParcelPrimCountAdd;
-            m_Scene.EventManager.OnObjectBeingRemovedFromScene +=
+            m_Scene.EventManager.OnObjectBeingRemovedFromScene +=  OnObjectBeingRemovedFromScene;
-                    OnObjectBeingRemovedFromScene;
+            m_Scene.EventManager.OnParcelPrimCountTainted +=  OnParcelPrimCountTainted;
-            m_Scene.EventManager.OnParcelPrimCountTainted +=
-                    OnParcelPrimCountTainted;
            m_Scene.EventManager.OnLandObjectAdded += delegate(ILandObject lo) { OnParcelPrimCountTainted(); };
        }
@@ -215,29 +213,15 @@ namespace OpenSim.Region.CoreModules.World.Land
                else
                    parcelCounts.Users[obj.OwnerID] = partCount;
-                if (obj.IsSelected)
+                if (obj.IsSelected || obj.GetSittingAvatarsCount() > 0)
-                {
                    parcelCounts.Selected += partCount;
-                }
+                if (obj.OwnerID == landData.OwnerID)
+                    parcelCounts.Owner += partCount;
+                else if (landData.GroupID != UUID.Zero && obj.GroupID == landData.GroupID)
+                    parcelCounts.Group += partCount;
                else
-                {
+                    parcelCounts.Others += partCount;
-                    if (landData.IsGroupOwned)
-                    {
-                        if (obj.OwnerID == landData.GroupID)
-                            parcelCounts.Owner += partCount;
-                        else if (landData.GroupID != UUID.Zero && obj.GroupID == landData.GroupID)
-                            parcelCounts.Group += partCount;
-                        else
-                            parcelCounts.Others += partCount;
-                    }
-                    else
-                    {
-                        if (obj.OwnerID == landData.OwnerID)
-                            parcelCounts.Owner += partCount;
-                        else
-                            parcelCounts.Others += partCount;
-                    }
-                }
            }
        }
@@ -393,7 +377,6 @@ namespace OpenSim.Region.CoreModules.World.Land
                    count = counts.Owner;
                    count += counts.Group;
                    count += counts.Others;
-                    count += counts.Selected;
                }
            }
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
index 0d8ece7..a349aa1 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
            m_scene.AddNewSceneObject(sog, false);
-            m_scene.SceneGraph.DuplicateObject(sog.LocalId, Vector3.Zero, 0, m_userId, UUID.Zero, Quaternion.Identity);
+            m_scene.SceneGraph.DuplicateObject(sog.LocalId, Vector3.Zero, m_userId, UUID.Zero, Quaternion.Identity, false);
            Assert.That(pc.Owner, Is.EqualTo(6));
            Assert.That(pc.Group, Is.EqualTo(0));
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index 2837358..90d65c7 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -89,28 +89,23 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
            if (part == null)
                return;
-            if (part.ParentGroup.IsDeleted)
+            SceneObjectGroup sog = part.ParentGroup;
+            if (sog == null || sog.IsDeleted)
                return;
-            if (part.OwnerID != part.GroupID && part.OwnerID != client.AgentId && (!m_scene.Permissions.IsGod(client.AgentId)))
+            // Does the user have the power to put the object on sale?
-                return;
+            if (!m_scene.Permissions.CanSellObject(client, sog, saleType))
-            if (part.OwnerID == part.GroupID) // Group owned
            {
-                // Does the user have the power to put the object on sale?
+                client.SendAgentAlertMessage("You don't have permission to set object on sale", false);
-                if (!m_scene.Permissions.CanSellGroupObject(client.AgentId, part.GroupID, m_scene))
+                return;
-                {
-                    client.SendAgentAlertMessage("You don't have permission to set group-owned objects on sale", false);
-                    return;
-                }
            }
-            part = part.ParentGroup.RootPart;
+            part = sog.RootPart;
            part.ObjectSaleType = saleType;
            part.SalePrice = salePrice;
-            part.ParentGroup.HasGroupChanged = true;
+            sog.HasGroupChanged = true;
            part.SendPropertiesToClient(client);
        }
@@ -127,7 +122,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
            switch (saleType)
            {
            case 1: // Sell as original (in-place sale)
-                uint effectivePerms = group.GetEffectivePermissions();
+                uint effectivePerms = group.EffectiveOwnerPerms;
                if ((effectivePerms & (uint)PermissionMask.Transfer) == 0)
                {
@@ -136,8 +131,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                    return false;
                }
-                group.SetOwnerId(remoteClient.AgentId);
+                group.SetOwner(remoteClient.AgentId, remoteClient.ActiveGroupId);
-                group.SetRootPartOwner(part, remoteClient.AgentId, remoteClient.ActiveGroupId);
                if (m_scene.Permissions.PropagatePermissions())
                {
@@ -147,6 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                        child.TriggerScriptChangedEvent(Changed.OWNER);
                        child.ApplyNextOwnerPermissions();
                    }
+                    group.AggregatePerms();
                }
                part.ObjectSaleType = 0;
@@ -174,7 +169,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(group);
                group.AbsolutePosition = originalPosition;
-                uint perms = group.GetEffectivePermissions();
+                uint perms = group.EffectiveOwnerPerms;
                if ((perms & (uint)PermissionMask.Transfer) == 0)
                {
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 86f0a58..bc86076 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        protected Scene m_scene;
+        protected ScenePermissions scenePermissions;
        protected bool m_Enabled;
        private InventoryFolderImpl m_libraryRootFolder;
@@ -69,15 +70,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        }
        #region Constants
-        // These are here for testing.  They will be taken out
-        //private uint PERM_ALL = (uint)2147483647;
-        private uint PERM_COPY = (uint)32768;
-        //private uint PERM_MODIFY = (uint)16384;
-        private uint PERM_MOVE = (uint)524288;
-        private uint PERM_TRANS = (uint)8192;
-        private uint PERM_LOCKED = (uint)540672;
        /// <value>
        /// Different user set names that come in from the configuration file.
        /// </value>
@@ -96,14 +88,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        private bool m_bypassPermissionsValue = true;
        private bool m_propagatePermissions = false;
        private bool m_debugPermissions = false;
-        private bool m_allowGridGods = false;
+        private bool m_allowGridAdmins = false;
-        private bool m_RegionOwnerIsGod = false;
+        private bool m_RegionOwnerIsAdmin = false;
-        private bool m_RegionManagerIsGod = false;
+        private bool m_RegionManagerIsAdmin = false;
-        private bool m_forceGridGodsOnly;
+        private bool m_forceGridAdminsOnly;
-        private bool m_forceGodModeAlwaysOn;
+        private bool m_forceAdminModeAlwaysOn;
-        private bool m_allowGodActionsWithoutGodMode;
+        private bool m_allowAdminActionsWithoutGodMode;
-        private bool m_SimpleBuildPermissions = false;
        /// <value>
        /// The set of users that are allowed to create scripts.  This is only active if permissions are not being
@@ -172,25 +162,23 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            string[] sections = new string[] { "Startup", "Permissions" };
-            m_allowGridGods = Util.GetConfigVarFromSections<bool>(config, "allow_grid_gods", sections, false);
+            m_allowGridAdmins = Util.GetConfigVarFromSections<bool>(config, "allow_grid_gods", sections, false);
            m_bypassPermissions = !Util.GetConfigVarFromSections<bool>(config, "serverside_object_permissions", sections, true);
            m_propagatePermissions = Util.GetConfigVarFromSections<bool>(config, "propagate_permissions", sections, true);
-            m_forceGridGodsOnly = Util.GetConfigVarFromSections<bool>(config, "force_grid_gods_only", sections, false);
+            m_forceGridAdminsOnly = Util.GetConfigVarFromSections<bool>(config, "force_grid_gods_only", sections, false);
-            if(!m_forceGridGodsOnly)
+            if(!m_forceGridAdminsOnly)
            {            
-                m_RegionOwnerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_owner_is_god",sections, true);
+                m_RegionOwnerIsAdmin = Util.GetConfigVarFromSections<bool>(config, "region_owner_is_god",sections, true);
-                m_RegionManagerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_manager_is_god",sections, false);
+                m_RegionManagerIsAdmin = Util.GetConfigVarFromSections<bool>(config, "region_manager_is_god",sections, false);
            }
            else
-                m_allowGridGods = true;
+                m_allowGridAdmins = true;
-            m_forceGodModeAlwaysOn = Util.GetConfigVarFromSections<bool>(config, "automatic_gods", sections, false);
+            m_forceAdminModeAlwaysOn = Util.GetConfigVarFromSections<bool>(config, "automatic_gods", sections, false);
-            m_allowGodActionsWithoutGodMode = Util.GetConfigVarFromSections<bool>(config, "implicit_gods", sections, false);
+            m_allowAdminActionsWithoutGodMode = Util.GetConfigVarFromSections<bool>(config, "implicit_gods", sections, false);
-            if(m_allowGodActionsWithoutGodMode)
+            if(m_allowAdminActionsWithoutGodMode)
-                m_forceGodModeAlwaysOn = false;
+                m_forceAdminModeAlwaysOn = false;
-            m_SimpleBuildPermissions = Util.GetConfigVarFromSections<bool>(config, "simple_build_permissions",sections, false);
            m_allowedScriptCreators
                = ParseUserSetConfigSetting(config, "allowed_script_creators", m_allowedScriptCreators);
@@ -266,63 +254,77 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            m_scene = scene;
            scene.RegisterModuleInterface<IPermissionsModule>(this);
+            scenePermissions = m_scene.Permissions;
            //Register functions with Scene External Checks!
-            m_scene.Permissions.OnBypassPermissions += BypassPermissions;
+            scenePermissions.OnBypassPermissions += BypassPermissions;
-            m_scene.Permissions.OnSetBypassPermissions += SetBypassPermissions;
+            scenePermissions.OnSetBypassPermissions += SetBypassPermissions;
-            m_scene.Permissions.OnPropagatePermissions += PropagatePermissions;
+            scenePermissions.OnPropagatePermissions += PropagatePermissions;
-            m_scene.Permissions.OnGenerateClientFlags += GenerateClientFlags;
-            m_scene.Permissions.OnAbandonParcel += CanAbandonParcel;
+            scenePermissions.OnIsGridGod += IsGridAdministrator;
-            m_scene.Permissions.OnReclaimParcel += CanReclaimParcel;
+            scenePermissions.OnIsAdministrator += IsAdministrator;
-            m_scene.Permissions.OnDeedParcel += CanDeedParcel;
+            scenePermissions.OnIsEstateManager += IsEstateManager;
-            m_scene.Permissions.OnDeedObject += CanDeedObject;
-            m_scene.Permissions.OnIsGod += IsGod;
+            scenePermissions.OnGenerateClientFlags += GenerateClientFlags;
-            m_scene.Permissions.OnIsGridGod += IsGridGod;
-            m_scene.Permissions.OnIsAdministrator += IsAdministrator;
+            scenePermissions.OnIssueEstateCommand += CanIssueEstateCommand;
-            m_scene.Permissions.OnIsEstateManager += IsEstateManager;
+            scenePermissions.OnRunConsoleCommand += CanRunConsoleCommand;
-            m_scene.Permissions.OnDuplicateObject += CanDuplicateObject;
-            m_scene.Permissions.OnDeleteObject += CanDeleteObject;
+            scenePermissions.OnTeleport += CanTeleport;
-            m_scene.Permissions.OnEditObject += CanEditObject;
-            m_scene.Permissions.OnEditParcelProperties += CanEditParcelProperties;
+            scenePermissions.OnInstantMessage += CanInstantMessage;
-            m_scene.Permissions.OnInstantMessage += CanInstantMessage;
-            m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer;
+            scenePermissions.OnAbandonParcel += CanAbandonParcel;
-            m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand;
+            scenePermissions.OnReclaimParcel += CanReclaimParcel;
-            m_scene.Permissions.OnMoveObject += CanMoveObject;
+            scenePermissions.OnDeedParcel += CanDeedParcel;
-            m_scene.Permissions.OnObjectEntry += CanObjectEntry;
+            scenePermissions.OnSellParcel += CanSellParcel;
-            m_scene.Permissions.OnReturnObjects += CanReturnObjects;
+            scenePermissions.OnEditParcelProperties += CanEditParcelProperties;
-            m_scene.Permissions.OnRezObject += CanRezObject;
+            scenePermissions.OnTerraformLand += CanTerraformLand;
-            m_scene.Permissions.OnRunConsoleCommand += CanRunConsoleCommand;
+            scenePermissions.OnBuyLand += CanBuyLand;
-            m_scene.Permissions.OnRunScript += CanRunScript;
-            m_scene.Permissions.OnCompileScript += CanCompileScript;
+            scenePermissions.OnReturnObjects += CanReturnObjects;
-            m_scene.Permissions.OnSellParcel += CanSellParcel;
-            m_scene.Permissions.OnTakeObject += CanTakeObject;
+            scenePermissions.OnRezObject += CanRezObject;
-            m_scene.Permissions.OnSellGroupObject += CanSellGroupObject;
+            scenePermissions.OnObjectEntry += CanObjectEntry;
-            m_scene.Permissions.OnTakeCopyObject += CanTakeCopyObject;
-            m_scene.Permissions.OnTerraformLand += CanTerraformLand;
+            scenePermissions.OnDuplicateObject += CanDuplicateObject;
-            m_scene.Permissions.OnLinkObject += CanLinkObject;
+            scenePermissions.OnDeleteObjectByIDs += CanDeleteObjectByIDs;
-            m_scene.Permissions.OnDelinkObject += CanDelinkObject;
+            scenePermissions.OnDeleteObject += CanDeleteObject;
-            m_scene.Permissions.OnBuyLand += CanBuyLand;
+            scenePermissions.OnEditObjectByIDs += CanEditObjectByIDs;
+            scenePermissions.OnEditObject += CanEditObject;
-            m_scene.Permissions.OnViewNotecard += CanViewNotecard;
+            scenePermissions.OnInventoryTransfer += CanInventoryTransfer;
-            m_scene.Permissions.OnViewScript += CanViewScript;
+            scenePermissions.OnMoveObject += CanMoveObject;
-            m_scene.Permissions.OnEditNotecard += CanEditNotecard;
+            scenePermissions.OnTakeObject += CanTakeObject;
-            m_scene.Permissions.OnEditScript += CanEditScript;
+            scenePermissions.OnTakeCopyObject += CanTakeCopyObject;
+            scenePermissions.OnLinkObject += CanLinkObject;
-            m_scene.Permissions.OnCreateObjectInventory += CanCreateObjectInventory;
+            scenePermissions.OnDelinkObject += CanDelinkObject;
-            m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;
+            scenePermissions.OnDeedObject += CanDeedObject;
-            m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory;
+            scenePermissions.OnSellGroupObject += CanSellGroupObject;
-            m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory;
+            scenePermissions.OnSellObjectByUserID += CanSellObjectByUserID;
-            m_scene.Permissions.OnResetScript += CanResetScript;
+            scenePermissions.OnSellObject += CanSellObject;
+            
-            m_scene.Permissions.OnCreateUserInventory += CanCreateUserInventory;
+            scenePermissions.OnCreateObjectInventory += CanCreateObjectInventory;
-            m_scene.Permissions.OnCopyUserInventory += CanCopyUserInventory;
+            scenePermissions.OnEditObjectInventory += CanEditObjectInventory;
-            m_scene.Permissions.OnEditUserInventory += CanEditUserInventory;
+            scenePermissions.OnCopyObjectInventory += CanCopyObjectInventory;
-            m_scene.Permissions.OnDeleteUserInventory += CanDeleteUserInventory;
+            scenePermissions.OnDeleteObjectInventory += CanDeleteObjectInventory;
+            scenePermissions.OnDoObjectInvToObjectInv += CanDoObjectInvToObjectInv;
-            m_scene.Permissions.OnTeleport += CanTeleport;
+            scenePermissions.OnDropInObjectInv += CanDropInObjectInv;
-            m_scene.Permissions.OnControlPrimMedia += CanControlPrimMedia;
+            scenePermissions.OnViewNotecard += CanViewNotecard;
-            m_scene.Permissions.OnInteractWithPrimMedia += CanInteractWithPrimMedia;
+            scenePermissions.OnViewScript += CanViewScript;
+            scenePermissions.OnEditNotecard += CanEditNotecard;
+            scenePermissions.OnEditScript += CanEditScript;
+            scenePermissions.OnResetScript += CanResetScript;
+            scenePermissions.OnRunScript += CanRunScript;
+            scenePermissions.OnCompileScript += CanCompileScript;
+            
+            scenePermissions.OnCreateUserInventory += CanCreateUserInventory;
+            scenePermissions.OnCopyUserInventory += CanCopyUserInventory;
+            scenePermissions.OnEditUserInventory += CanEditUserInventory;
+            scenePermissions.OnDeleteUserInventory += CanDeleteUserInventory;
+            scenePermissions.OnControlPrimMedia += CanControlPrimMedia;
+            scenePermissions.OnInteractWithPrimMedia += CanInteractWithPrimMedia;
            m_scene.AddCommand("Users", this, "bypass permissions",
                    "bypass permissions <true / false>",
@@ -351,6 +353,76 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                return;
            m_scene.UnregisterModuleInterface<IPermissionsModule>(this);
+            scenePermissions.OnBypassPermissions -= BypassPermissions;
+            scenePermissions.OnSetBypassPermissions -= SetBypassPermissions;
+            scenePermissions.OnPropagatePermissions -= PropagatePermissions;
+            scenePermissions.OnIsGridGod -= IsGridAdministrator;
+            scenePermissions.OnIsAdministrator -= IsAdministrator;
+            scenePermissions.OnIsEstateManager -= IsEstateManager;
+            scenePermissions.OnGenerateClientFlags -= GenerateClientFlags;
+            scenePermissions.OnIssueEstateCommand -= CanIssueEstateCommand;
+            scenePermissions.OnRunConsoleCommand -= CanRunConsoleCommand;
+            scenePermissions.OnTeleport -= CanTeleport;
+            scenePermissions.OnInstantMessage -= CanInstantMessage;
+            scenePermissions.OnAbandonParcel -= CanAbandonParcel;
+            scenePermissions.OnReclaimParcel -= CanReclaimParcel;
+            scenePermissions.OnDeedParcel -= CanDeedParcel;
+            scenePermissions.OnSellParcel -= CanSellParcel;
+            scenePermissions.OnEditParcelProperties -= CanEditParcelProperties;
+            scenePermissions.OnTerraformLand -= CanTerraformLand;
+            scenePermissions.OnBuyLand -= CanBuyLand;
+            scenePermissions.OnRezObject -= CanRezObject;
+            scenePermissions.OnObjectEntry -= CanObjectEntry;
+            scenePermissions.OnReturnObjects -= CanReturnObjects;
+            scenePermissions.OnDuplicateObject -= CanDuplicateObject;
+            scenePermissions.OnDeleteObjectByIDs -= CanDeleteObjectByIDs;
+            scenePermissions.OnDeleteObject -= CanDeleteObject;
+            scenePermissions.OnEditObjectByIDs -= CanEditObjectByIDs;
+            scenePermissions.OnEditObject -= CanEditObject;
+            scenePermissions.OnInventoryTransfer -= CanInventoryTransfer;
+            scenePermissions.OnMoveObject -= CanMoveObject;
+            scenePermissions.OnTakeObject -= CanTakeObject;
+            scenePermissions.OnTakeCopyObject -= CanTakeCopyObject;
+            scenePermissions.OnLinkObject -= CanLinkObject;
+            scenePermissions.OnDelinkObject -= CanDelinkObject;
+            scenePermissions.OnDeedObject -= CanDeedObject;
+            scenePermissions.OnSellGroupObject -= CanSellGroupObject;
+            scenePermissions.OnSellObjectByUserID -= CanSellObjectByUserID;
+            scenePermissions.OnSellObject -= CanSellObject;
+            
+            scenePermissions.OnCreateObjectInventory -= CanCreateObjectInventory;
+            scenePermissions.OnEditObjectInventory -= CanEditObjectInventory;
+            scenePermissions.OnCopyObjectInventory -= CanCopyObjectInventory;
+            scenePermissions.OnDeleteObjectInventory -= CanDeleteObjectInventory;
+            scenePermissions.OnDoObjectInvToObjectInv -= CanDoObjectInvToObjectInv;
+            scenePermissions.OnDropInObjectInv -= CanDropInObjectInv;
+            scenePermissions.OnViewNotecard -= CanViewNotecard;
+            scenePermissions.OnViewScript -= CanViewScript;
+            scenePermissions.OnEditNotecard -= CanEditNotecard;
+            scenePermissions.OnEditScript -= CanEditScript;
+            scenePermissions.OnResetScript -= CanResetScript;
+            scenePermissions.OnRunScript -= CanRunScript;
+            scenePermissions.OnCompileScript -= CanCompileScript;
+            
+            scenePermissions.OnCreateUserInventory -= CanCreateUserInventory;
+            scenePermissions.OnCopyUserInventory -= CanCopyUserInventory;
+            scenePermissions.OnEditUserInventory -= CanEditUserInventory;
+            scenePermissions.OnDeleteUserInventory -= CanDeleteUserInventory;
+            scenePermissions.OnControlPrimMedia -= CanControlPrimMedia;
+            scenePermissions.OnInteractWithPrimMedia -= CanInteractWithPrimMedia;
        }
        public void Close()
@@ -479,32 +551,37 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            return false;
        }
-/*
-        private bool CheckGroupPowers(ScenePresence sp, UUID groupID, ulong powersMask)
+        protected bool GroupMemberPowers(UUID groupID, UUID userID, ref ulong powers)
        {
-            if(sp == null || sp.ControllingClient == null)
+            powers = 0;
+            if (null == GroupsModule)
                return false;
- 
-            ulong grpPowers = sp.ControllingClient.GetGroupPowers(groupID);
-            return (grpPowers & powersMask) != 0;
+            GroupMembershipData gmd = GroupsModule.GetMembershipData(groupID, userID);
+            
+            if (gmd != null)
+            {
+                powers = gmd.GroupPowers;
+                return true;
+            }
+            return false;
        }
-        private bool CheckActiveGroupPowers(ScenePresence sp, UUID groupID, ulong powersMask)
+        protected bool GroupMemberPowers(UUID groupID, ScenePresence sp, ref ulong powers)
        {
-            if(sp == null || sp.ControllingClient == null)
+            powers = 0;
-                return false;
+            IClientAPI client = sp.ControllingClient;
- 
+            if (client == null)
-            if(sp.ControllingClient.ActiveGroupId != groupID)
                return false;
-            // activeGroupPowers only get current selected role powers, at least with xmlgroups.
-            // lets get any role avoiding the extra burden of user also having to change role
-            //  ulong grpPowers = sp.ControllingClient.ActiveGroupPowers(groupID);
-            ulong grpPowers = sp.ControllingClient.GetGroupPowers(groupID);
-            return (grpPowers & powersMask) != 0;
+            if(!client.IsGroupMember(groupID))
+                return false;
+            
+            powers =  client.GetGroupPowers(groupID);          
+            return true;
        }
-*/
        /// <summary>
        /// Parse a user set configuration setting
        /// </summary>
@@ -551,13 +628,13 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            if (user == UUID.Zero)
                return false;
-            if (m_scene.RegionInfo.EstateSettings.EstateOwner == user && m_RegionOwnerIsGod)
+            if (m_RegionOwnerIsAdmin && m_scene.RegionInfo.EstateSettings.EstateOwner == user)
                return true;
-            if (IsEstateManager(user) && m_RegionManagerIsGod)
+            if (m_RegionManagerIsAdmin && IsEstateManager(user))
                return true;
-            if (IsGridGod(user, null))
+            if (IsGridAdministrator(user))
                return true;
            return false;
@@ -569,14 +646,15 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        /// <param name="user">The user</param>
        /// <param name="scene">Unused, can be null</param>
        /// <returns></returns>
-        protected bool IsGridGod(UUID user, Scene scene)
+        protected bool IsGridAdministrator(UUID user)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            if (user == UUID.Zero) return false;
+            if (user == UUID.Zero)
+                return false;
-            if (m_allowGridGods)
+            if (m_allowGridAdmins)
            {
                ScenePresence sp = m_scene.GetScenePresence(user);
                if (sp != null)
@@ -630,8 +708,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        }
        #region Object Permissions
-#pragma warning disable 0612
-        const uint DEFAULT_FLAGS  = (uint)~(
+        const uint DEFAULT_FLAGS  = (uint)(
            PrimFlags.ObjectCopy | // Tells client you can copy the object
            PrimFlags.ObjectModify | // tells client you can modify the object
            PrimFlags.ObjectMove |   // tells client that you can move the object (only, no mod)
@@ -650,7 +728,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            PrimFlags.ObjectAnyOwner | // Tells client that someone owns the object
            PrimFlags.ObjectOwnerModify // Tells client that you're the owner of the object
            );
-#pragma warning restore 0612
        const uint EXTRAOWNERMASK = (uint)(
                PrimFlags.ObjectYouOwner | 
@@ -665,49 +742,71 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                PrimFlags.ObjectMove
                );
-        public uint GenerateClientFlags(ScenePresence sp, uint curEffectivePerms, UUID objID)
+        const uint GOD_FLAGS  = (uint)(
-        {
+            PrimFlags.ObjectCopy | // Tells client you can copy the object
-            if(sp == null || curEffectivePerms == 0)
+            PrimFlags.ObjectModify | // tells client you can modify the object
-                return (uint)0;
+            PrimFlags.ObjectMove |   // tells client that you can move the object (only, no mod)
+            PrimFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it
+            PrimFlags.ObjectYouOwner | // Tells client that you're the owner of the object
+            PrimFlags.ObjectAnyOwner | // Tells client that someone owns the object
+            PrimFlags.ObjectOwnerModify // Tells client that you're the owner of the object
+            );
-            SceneObjectPart task = m_scene.GetSceneObjectPart(objID);
+        const uint LOCKED_GOD_FLAGS  = (uint)(
+            PrimFlags.ObjectCopy | // Tells client you can copy the object
+            PrimFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it
+            PrimFlags.ObjectYouOwner | // Tells client that you're the owner of the object
+            PrimFlags.ObjectAnyOwner // Tells client that someone owns the object
+            );
+        const uint SHAREDMASK  = (uint)(
+            PermissionMask.Move |
+            PermissionMask.Modify |
+            PermissionMask.Copy
+            );
+        public uint GenerateClientFlags(SceneObjectPart task, ScenePresence sp, uint curEffectivePerms)
+        {
+            if(sp == null  || task == null || curEffectivePerms == 0)
+                return 0;
-            // this shouldn't ever happen..     return no permissions/objectflags.
-            if (task == null)
-                return (uint)0;
- 
            // Remove any of the objectFlags that are temporary.  These will get added back if appropriate
            uint objflags = curEffectivePerms & NOT_DEFAULT_FLAGS ;
            uint returnMask;
-            // gods have owner rights with Modify and Move always on 
+            SceneObjectGroup grp = task.ParentGroup;
+            if(grp == null)
+                return 0;
+            UUID taskOwnerID = task.OwnerID;
+            UUID spID = sp.UUID;
+            bool unlocked = (grp.RootPart.OwnerMask & (uint)PermissionMask.Move) != 0;
            if(sp.IsGod)
            {
-                returnMask = ApplyObjectModifyMasks(task.OwnerMask, objflags, true);
+                // do locked on objects owned by admin
-                returnMask |= EXTRAGODMASK;
+                if(!unlocked && spID == taskOwnerID)
-                return returnMask;
+                    return objflags | LOCKED_GOD_FLAGS;
+                else
+                    return objflags | GOD_FLAGS;
            }
            //bypass option == owner rights
            if (m_bypassPermissions)
            {
-                returnMask = ApplyObjectModifyMasks(task.OwnerMask, objflags, true);
+                returnMask = ApplyObjectModifyMasks(task.OwnerMask, objflags, true);  //??
                returnMask |= EXTRAOWNERMASK;
                if((returnMask & (uint)PrimFlags.ObjectModify) != 0)
                    returnMask |= (uint)PrimFlags.ObjectOwnerModify;
                return returnMask;
            }
-            bool unlocked = (task.ParentGroup.RootPart.OwnerMask & (uint)PermissionMask.Move) != 0;
-            UUID taskOwnerID = task.OwnerID;
-            UUID spID = sp.UUID;
            // owner
            if (spID == taskOwnerID)
            {
-                returnMask = ApplyObjectModifyMasks(task.OwnerMask, objflags, unlocked);
+                returnMask = ApplyObjectModifyMasks(grp.EffectiveOwnerPerms, objflags, unlocked);
                returnMask |= EXTRAOWNERMASK;
                if((returnMask & (uint)PrimFlags.ObjectModify) != 0)
                    returnMask |= (uint)PrimFlags.ObjectOwnerModify;
@@ -717,19 +816,19 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            // if not god or owner, do attachments as everyone
            if(task.ParentGroup.IsAttachment)
            {
-                returnMask = ApplyObjectModifyMasks(task.EveryoneMask, objflags, unlocked);
+                returnMask = ApplyObjectModifyMasks(grp.EffectiveEveryOnePerms, objflags, unlocked);
                if (taskOwnerID != UUID.Zero)
                    returnMask |= (uint)PrimFlags.ObjectAnyOwner;
                return returnMask;
            }
            UUID taskGroupID = task.GroupID;
-            bool groupdOwned = taskOwnerID == taskGroupID;
+            bool notGroupdOwned = taskOwnerID != taskGroupID;
            // if friends with rights then owner
-            if (!groupdOwned && IsFriendWithPerms(spID, taskOwnerID))
+            if (notGroupdOwned && IsFriendWithPerms(spID, taskOwnerID))
            {
-                returnMask = ApplyObjectModifyMasks(task.OwnerMask, objflags, unlocked);
+                returnMask = ApplyObjectModifyMasks(grp.EffectiveOwnerPerms, objflags, unlocked);
                returnMask |= EXTRAOWNERMASK;
                if((returnMask & (uint)PrimFlags.ObjectModify) != 0)
                    returnMask |= (uint)PrimFlags.ObjectOwnerModify;
@@ -738,43 +837,44 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            // group owned or shared ?
            IClientAPI client = sp.ControllingClient;
-            if(taskGroupID != UUID.Zero &&  client != null && client.IsGroupMember(taskGroupID))
+            ulong  powers = 0;
+            if(taskGroupID != UUID.Zero && GroupMemberPowers(taskGroupID, sp, ref powers))
            {
-                if(groupdOwned)
+                if(notGroupdOwned)
-                {
-                    // object is owned by group, check role powers
-                    if((client.GetGroupPowers(taskGroupID) & (ulong)GroupPowers.ObjectManipulate) != 0)
-                    {
-                        returnMask = ApplyObjectModifyMasks(task.OwnerMask, objflags, unlocked);
-                        returnMask |= 
-                            (uint)PrimFlags.ObjectGroupOwned |
-                            (uint)PrimFlags.ObjectAnyOwner;
-                        if((returnMask & (uint)PrimFlags.ObjectModify) != 0)
-                            returnMask |= (uint)PrimFlags.ObjectOwnerModify;
-                        return returnMask;
-                    }
-                    else
-                    {
-                        // group sharing or everyone
-                        returnMask = ApplyObjectModifyMasks(task.GroupMask | task.EveryoneMask, objflags, unlocked);
-                        returnMask |=
-                            (uint)PrimFlags.ObjectGroupOwned |
-                            (uint)PrimFlags.ObjectAnyOwner;
-                        return returnMask;
-                    }
-                }
-                else
                {
                    // group sharing or everyone
-                    returnMask = ApplyObjectModifyMasks(task.GroupMask | task.EveryoneMask, objflags, unlocked);
+                    returnMask = ApplyObjectModifyMasks(grp.EffectiveGroupOrEveryOnePerms, objflags, unlocked);
                    if (taskOwnerID != UUID.Zero)
                        returnMask |= (uint)PrimFlags.ObjectAnyOwner;
                    return returnMask;
                }
+                // object is owned by group, check role powers
+                if((powers & (ulong)GroupPowers.ObjectManipulate) == 0)
+                {
+                    // group sharing or everyone
+                    returnMask = ApplyObjectModifyMasks(grp.EffectiveGroupOrEveryOnePerms, objflags, unlocked);
+                    returnMask |=
+                        (uint)PrimFlags.ObjectGroupOwned |
+                        (uint)PrimFlags.ObjectAnyOwner;
+                    return returnMask;
+                }
+                // we may have copy without transfer
+                uint grpEffectiveOwnerPerms = grp.EffectiveOwnerPerms;
+                if((grpEffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
+                    grpEffectiveOwnerPerms &= ~(uint)PermissionMask.Copy;
+                returnMask = ApplyObjectModifyMasks(grpEffectiveOwnerPerms, objflags, unlocked);
+                returnMask |= 
+                    (uint)PrimFlags.ObjectGroupOwned |
+                    (uint)PrimFlags.ObjectYouOwner;
+                if((returnMask & (uint)PrimFlags.ObjectModify) != 0)
+                    returnMask |= (uint)PrimFlags.ObjectOwnerModify;
+                return returnMask;
            }
            // fallback is everyone rights
-            returnMask = ApplyObjectModifyMasks(task.EveryoneMask, objflags, unlocked);
+            returnMask = ApplyObjectModifyMasks(grp.EffectiveEveryOnePerms, objflags, unlocked);
            if (taskOwnerID != UUID.Zero)
                returnMask |= (uint)PrimFlags.ObjectAnyOwner;
            return returnMask;
@@ -811,7 +911,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            return objectFlagsMask;
        }
-        // OARs need this method that handles offline users
+        // OARs still need this method that handles offline users
        public PermissionClass GetPermissionClass(UUID user, SceneObjectPart obj)
        {
            if (obj == null)
@@ -842,107 +942,182 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            return PermissionClass.Everyone;
        }
-        /// <summary>
+        // get effective object permissions using user UUID. User rights will be fixed
-        /// General permissions checks for any operation involving an object.  These supplement more specific checks
+        protected uint GetObjectPermissions(UUID currentUser, SceneObjectGroup group, bool denyOnLocked)
-        /// implemented by callers.
-        /// </summary>
-        /// <param name="currentUser"></param>
-        /// <param name="objId">This is a scene object group UUID</param>
-        /// <param name="denyOnLocked"></param>
-        /// <returns></returns>
-        protected bool GenericObjectPermission(UUID currentUser, UUID objId, bool denyOnLocked)
        {
-            // Default: deny
+            if (group == null)
-            bool permission = false;
+                return 0;
-            bool locked = false;
-            SceneObjectPart part = m_scene.GetSceneObjectPart(objId);
-            if (part == null)
-                return false;
-            SceneObjectGroup group = part.ParentGroup;
+            SceneObjectPart root = group.RootPart;
+            if (root == null)
+                return 0;
            UUID objectOwner = group.OwnerID;
-            locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0);
+            bool locked = denyOnLocked && ((root.OwnerMask & (uint)PermissionMask.Move) == 0);
-            // People shouldn't be able to do anything with locked objects, except the Administrator
+            if (IsAdministrator(currentUser))
-            // The 'set permissions' runs through a different permission check, so when an object owner
-            // sets an object locked, the only thing that they can do is unlock it.
-            //
-            // Nobody but the object owner can set permissions on an object
-            //
-            if (locked && (!IsAdministrator(currentUser)) && denyOnLocked)
            {
-                return false;
+                // do lock on admin owned objects
+                if(locked && currentUser == objectOwner)
+                    return (uint)(PermissionMask.AllEffective & ~(PermissionMask.Modify | PermissionMask.Move));
+                return (uint)PermissionMask.AllEffective;
            }
-            // Object owners should be able to edit their own content
+            uint lockmask = (uint)PermissionMask.AllEffective;
+            if(locked)
+                lockmask &= ~(uint)(PermissionMask.Modify | PermissionMask.Move);
+           
            if (currentUser == objectOwner)
-            {
+                return group.EffectiveOwnerPerms & lockmask;
-                // there is no way that later code can change this back to false
+            
-                // so just return true immediately and short circuit the more
+            if (group.IsAttachment)
-                // expensive group checks
+                return 0;
-                return true;
-                //permission = true;
+            UUID sogGroupID = group.GroupID;
-            }
+            bool notgroudOwned = sogGroupID != objectOwner;
-            else if (group.IsAttachment)
-            {
-                permission = false;
-            }
-//            m_log.DebugFormat(
+            if (notgroudOwned && IsFriendWithPerms(currentUser, objectOwner))
-//                "[PERMISSIONS]: group.GroupID = {0}, part.GroupMask = {1}, isGroupMember = {2} for {3}",
+                return group.EffectiveOwnerPerms  & lockmask;
-//                group.GroupID,
-//                m_scene.GetSceneObjectPart(objId).GroupMask,
-//                IsGroupMember(group.GroupID, currentUser, 0),
-//                currentUser);
-            // Group members should be able to edit group objects
-            if ((group.GroupID != UUID.Zero)
-                && ((m_scene.GetSceneObjectPart(objId).GroupMask & (uint)PermissionMask.Modify) != 0)
-                && IsGroupMember(group.GroupID, currentUser, 0))
-            {
-                // Return immediately, so that the administrator can shares group objects
-                return true;
-            }
-            // Friends with benefits should be able to edit the objects too
+            ulong powers = 0;
-            if (IsFriendWithPerms(currentUser, objectOwner))
+            if (sogGroupID != UUID.Zero && GroupMemberPowers(sogGroupID, currentUser, ref powers))
            {
-                // Return immediately, so that the administrator can share objects with friends
+                if(notgroudOwned)
-                return true;
+                    return  group.EffectiveGroupOrEveryOnePerms & lockmask;
+                if((powers & (ulong)GroupPowers.ObjectManipulate) == 0)
+                    return  group.EffectiveGroupOrEveryOnePerms & lockmask;
+                uint grpEffectiveOwnerPerms = group.EffectiveOwnerPerms & lockmask;
+                if((grpEffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
+                    grpEffectiveOwnerPerms &= ~(uint)PermissionMask.Copy;
+                return grpEffectiveOwnerPerms;
            }
-            // Users should be able to edit what is over their land.
+            return group.EffectiveEveryOnePerms & lockmask;
-            ILandObject parcel = m_scene.LandChannel.GetLandObject(group.AbsolutePosition.X, group.AbsolutePosition.Y);
+        }
-            if ((parcel != null) && (parcel.LandData.OwnerID == currentUser))
+        // get effective object permissions using present presence. So some may depend on requested rights (ie God)
+        protected uint GetObjectPermissions(ScenePresence sp, SceneObjectGroup group, bool denyOnLocked)
+        {
+            if (sp == null || sp.IsDeleted || group == null || group.IsDeleted)
+                return 0;
+            SceneObjectPart root = group.RootPart;
+            if (root == null)
+                return 0;
+            UUID spID = sp.UUID;
+            UUID objectOwner = group.OwnerID;
+            bool locked = denyOnLocked && ((root.OwnerMask & (uint)PermissionMask.Move) == 0);
+            if (sp.IsGod)
            {
-                permission = true;
+                if(locked && spID == objectOwner)
+                    return (uint)(PermissionMask.AllEffective & ~(PermissionMask.Modify | PermissionMask.Move));
+                return (uint)PermissionMask.AllEffective;
            }
-            // Estate users should be able to edit anything in the sim
+            uint lockmask = (uint)PermissionMask.AllEffective;
-            if (IsEstateManager(currentUser))
+            if(locked)
+                lockmask &= ~(uint)(PermissionMask.Modify | PermissionMask.Move);
+           
+            if (spID == objectOwner)
+                return group.EffectiveOwnerPerms & lockmask;
+            
+            if (group.IsAttachment)
+                return 0;
+          
+            UUID sogGroupID = group.GroupID;
+            bool notgroudOwned = sogGroupID != objectOwner;
+            if (notgroudOwned && IsFriendWithPerms(spID, objectOwner))
+                return group.EffectiveOwnerPerms  & lockmask;
+            ulong powers = 0;
+            if (sogGroupID != UUID.Zero && GroupMemberPowers(sogGroupID, sp, ref powers))
            {
-                permission = true;
+                if(notgroudOwned)
+                    return  group.EffectiveGroupOrEveryOnePerms & lockmask;
+                if((powers & (ulong)GroupPowers.ObjectManipulate) == 0)
+                    return  group.EffectiveGroupOrEveryOnePerms & lockmask;
+                uint grpEffectiveOwnerPerms = group.EffectiveOwnerPerms & lockmask;
+                if((grpEffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
+                    grpEffectiveOwnerPerms &= ~(uint)PermissionMask.Copy;
+                return grpEffectiveOwnerPerms;
            }
-            // Admin objects should not be editable by the above
+            return group.EffectiveEveryOnePerms & lockmask;
-            if (IsAdministrator(objectOwner))
+        }
+        private uint GetObjectItemPermissions(UUID userID, TaskInventoryItem ti)
+        {
+            UUID tiOwnerID = ti.OwnerID;
+            if(tiOwnerID == userID)
+                return ti.CurrentPermissions;
+            
+            if(IsAdministrator(userID))
+                return (uint)PermissionMask.AllEffective;
+            // ??           
+            if (IsFriendWithPerms(userID, tiOwnerID))
+                return ti.CurrentPermissions;
+            UUID tiGroupID = ti.GroupID;
+            if(tiGroupID != UUID.Zero)
            {
-                permission = false;
+                ulong powers = 0;
+                if(GroupMemberPowers(tiGroupID, userID, ref powers))
+                {
+                    if(tiGroupID == ti.OwnerID)
+                    {
+                        if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                            return ti.CurrentPermissions;
+                    }
+                    return ti.GroupPermissions;
+                } 
            }
-            // Admin should be able to edit anything in the sim (including admin objects)
+            return 0;
-            if (IsAdministrator(currentUser))
+        }
+        private uint GetObjectItemPermissions(ScenePresence sp, TaskInventoryItem ti, bool notEveryone)
+        {
+            UUID tiOwnerID = ti.OwnerID;
+            UUID spID = sp.UUID;
+            if(tiOwnerID == spID)
+                return ti.CurrentPermissions;
+ 
+            // ??           
+            if (IsFriendWithPerms(spID, tiOwnerID))
+                return ti.CurrentPermissions;
+            UUID tiGroupID = ti.GroupID;
+            if(tiGroupID != UUID.Zero)
            {
-                permission = true;
+                ulong powers = 0;
+                if(GroupMemberPowers(tiGroupID, spID, ref powers))
+                {
+                    if(tiGroupID == ti.OwnerID)
+                    {
+                        if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                            return ti.CurrentPermissions;
+                    }
+                    uint p = ti.GroupPermissions;
+                    if(!notEveryone)
+                        p |= ti.EveryonePermissions;
+                    return p;
+                } 
            }
-            return permission;
+            if(notEveryone)
-        }
+                return 0;
+            return ti.EveryonePermissions;
+        }
        #endregion
        #region Generic Permissions
@@ -967,89 +1142,37 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        public bool GenericEstatePermission(UUID user)
        {
-            // Default: deny
-            bool permission = false;
            // Estate admins should be able to use estate tools
            if (IsEstateManager(user))
-                permission = true;
+                return true;
            // Administrators always have permission
            if (IsAdministrator(user))
-                permission = true;
+                return true;
-            return permission;
-        }
-        protected bool GenericParcelPermission(UUID user, ILandObject parcel, ulong groupPowers)
-        {
-            bool permission = false;
-            if (parcel.LandData.OwnerID == user)
-            {
-                permission = true;
-            }
-            if ((parcel.LandData.GroupID != UUID.Zero) && IsGroupMember(parcel.LandData.GroupID, user, groupPowers))
-            {
-                permission = true;
-            }
-            if (IsEstateManager(user))
-            {
-                permission = true;
-            }
-            if (IsAdministrator(user))
-            {
-                permission = true;
-            }
-            if (m_SimpleBuildPermissions &&
-                (parcel.LandData.Flags & (uint)ParcelFlags.UseAccessList) == 0 && parcel.IsInLandAccessList(user))
-                permission = true;
-            return permission;
+            return false;
        }
        protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers, bool allowEstateManager)
        {
            if (parcel.LandData.OwnerID == user)
-            {
-                // Returning immediately so that group deeded objects on group deeded land don't trigger a NRE on
-                // the subsequent redundant checks when using lParcelMediaCommandList()
-                // See http://opensimulator.org/mantis/view.php?id=3999 for more details
                return true;
-            }
            if (parcel.LandData.IsGroupOwned && IsGroupMember(parcel.LandData.GroupID, user, groupPowers))
-            {
                return true;
-            }
            if (allowEstateManager && IsEstateManager(user))
-            {
                return true;
-            }
            if (IsAdministrator(user))
-            {
                return true;
-            }
            return false;
        }
-        protected bool GenericParcelPermission(UUID user, Vector3 pos, ulong groupPowers)
-        {
-            ILandObject parcel = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
-            if (parcel == null) return false;
-            return GenericParcelPermission(user, parcel, groupPowers);
-        }
 #endregion
        #region Permission Checks
-        private bool CanAbandonParcel(UUID user, ILandObject parcel, Scene scene)
+        private bool CanAbandonParcel(UUID user, ILandObject parcel)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1057,7 +1180,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandRelease, false);
        }
-        private bool CanReclaimParcel(UUID user, ILandObject parcel, Scene scene)
+        private bool CanReclaimParcel(UUID user, ILandObject parcel)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1065,108 +1188,223 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            return GenericParcelOwnerPermission(user, parcel, 0,true);
        }
-        private bool CanDeedParcel(UUID user, ILandObject parcel, Scene scene)
+        private bool CanDeedParcel(UUID user, ILandObject parcel)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
+            if(parcel.LandData.GroupID == UUID.Zero)
+                return false;
+            if (IsAdministrator(user))
+                return true;
            if (parcel.LandData.OwnerID != user) // Only the owner can deed!
                return false;
-            ScenePresence sp = scene.GetScenePresence(user);
+            ScenePresence sp = m_scene.GetScenePresence(user);
-            IClientAPI client = sp.ControllingClient;
+            if(sp == null)
+                return false;
+            IClientAPI client = sp.ControllingClient;
            if ((client.GetGroupPowers(parcel.LandData.GroupID) & (ulong)GroupPowers.LandDeed) == 0)
                return false;
-            return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandDeed, false);
+            return true;
        }
-        private bool CanDeedObject(UUID user, UUID group, Scene scene)
+        private bool CanDeedObject(ScenePresence sp, SceneObjectGroup sog, UUID targetGroupID)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            ScenePresence sp = scene.GetScenePresence(user);
+            if(sog == null || sog.IsDeleted || sp == null || sp.IsDeleted || targetGroupID == UUID.Zero)
-            IClientAPI client = sp.ControllingClient;
+                return false;
+            // object has group already?
+            if(sog.GroupID != targetGroupID)
+                return false;
+            // is effectivelly shared?            
+            if(sog.EffectiveGroupPerms == 0)
+                return false;
-            if ((client.GetGroupPowers(group) & (ulong)GroupPowers.DeedObject) == 0)
+            if(sp.IsGod)
+                return true;
+            // owned by requester?
+            if(sog.OwnerID != sp.UUID)
+                return false;
+            // owner can transfer?
+            if((sog.EffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
+                return false;
+            
+            // group member ? 
+            ulong powers = 0;
+            if(!GroupMemberPowers(targetGroupID, sp, ref powers))
+                return false;
+            // has group rights?
+            if ((powers & (ulong)GroupPowers.DeedObject) == 0)
                return false;
            return true;
        }
-        private bool IsGod(UUID user, Scene scene)
+        private bool CanDuplicateObject(SceneObjectGroup sog, ScenePresence sp)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            return IsAdministrator(user);
+            if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
+                return false;
+            uint perms = GetObjectPermissions(sp, sog, false);
+            if((perms & (uint)PermissionMask.Copy) == 0)
+                return false;
+            if(sog.OwnerID != sp.UUID && (perms & (uint)PermissionMask.Transfer) == 0)
+                return false;
+            //If they can rez, they can duplicate
+            return CanRezObject(0, sp.UUID, sog.AbsolutePosition);
        }
-        private bool CanDuplicateObject(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition)
+        private bool CanDeleteObject(SceneObjectGroup sog, ScenePresence sp)
        {
+            // ignoring locked. viewers should warn and ask for confirmation
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            if (!GenericObjectPermission(owner, objectID, true))
+            if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
-            {
-                //They can't even edit the object
                return false;
-            }
-            SceneObjectPart part = scene.GetSceneObjectPart(objectID);
+            if(sog.IsAttachment)
-            if (part == null)
                return false;
-            if (part.OwnerID == owner)
+            UUID sogOwnerID = sog.OwnerID;
+            UUID spID = sp.UUID;
+            if(sogOwnerID == spID)
+                return true;
+            if (sp.IsGod)
+                return true;
+            if (IsFriendWithPerms(sog.UUID, sogOwnerID))
+                return true;
+            UUID sogGroupID = sog.GroupID;
+            if (sogGroupID != UUID.Zero)
            {
-                if ((part.OwnerMask & PERM_COPY) == 0)
+                ulong powers = 0;
-                    return false;
+                if(GroupMemberPowers(sogGroupID, sp, ref powers))
+                {
+                    if(sogGroupID == sogOwnerID)
+                    {
+                        if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                            return true;
+                    }
+                    return  (sog.EffectiveGroupPerms & (uint)PermissionMask.Modify) != 0;
+                } 
            }
-            else if (part.GroupID != UUID.Zero)
+            return false;
-            {
+        }
-                if ((part.OwnerID == part.GroupID) && ((owner != part.LastOwnerID) || ((part.GroupMask & PERM_TRANS) == 0)))
-                    return false;
-                if ((part.GroupMask & PERM_COPY) == 0)
+        private bool CanDeleteObjectByIDs(UUID objectID, UUID userID)
-                    return false;
+        {
-            }
+            // ignoring locked. viewers should warn and ask for confirmation
-            //If they can rez, they can duplicate
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
-            return CanRezObject(objectCount, owner, objectPosition, scene);
+            if (m_bypassPermissions) return m_bypassPermissionsValue;
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
+            if (sog == null)
+                return false;
+            if(sog.IsAttachment)
+                return false;
+            UUID sogOwnerID = sog.OwnerID;
+            if(sogOwnerID == userID)
+                return true;
+            if (IsAdministrator(userID))
+                return true;
+            if (IsFriendWithPerms(objectID, sogOwnerID))
+                return true;
+            UUID sogGroupID = sog.GroupID;
+            if (sogGroupID != UUID.Zero)
+            {
+                ulong powers = 0;
+                if(GroupMemberPowers(sogGroupID, userID, ref powers))
+                {
+                    if(sogGroupID == sogOwnerID)
+                    {
+                        if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                            return true;
+                    }
+                    return  (sog.EffectiveGroupPerms & (uint)PermissionMask.Modify) != 0;
+                } 
+            }
+            return false;
        }
-        private bool CanDeleteObject(UUID objectID, UUID deleter, Scene scene)
+        private bool CanEditObjectByIDs(UUID objectID, UUID userID)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            return GenericObjectPermission(deleter, objectID, false);
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
+            if (sog == null)
+                return false;
+            uint perms = GetObjectPermissions(userID, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            return true;
        }
-        private bool CanEditObject(UUID objectID, UUID editorID, Scene scene)
+        private bool CanEditObject(SceneObjectGroup sog, ScenePresence sp)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            return GenericObjectPermission(editorID, objectID, false);
+            if(sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
+                return false;
+            uint perms = GetObjectPermissions(sp, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            return true;
        }
-        private bool CanEditObjectInventory(UUID objectID, UUID editorID, Scene scene)
+        private bool CanEditObjectInventory(UUID objectID, UUID userID)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            return GenericObjectPermission(editorID, objectID, false);
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
+            if (sog == null)
+                return false;
+            uint perms = GetObjectPermissions(userID, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            return true;
        }
-        private bool CanEditParcelProperties(UUID user, ILandObject parcel, GroupPowers p, Scene scene, bool allowManager)
+        private bool CanEditParcelProperties(UUID userID, ILandObject parcel, GroupPowers p, bool allowManager)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            return GenericParcelOwnerPermission(user, parcel, (ulong)p, false);
+            return GenericParcelOwnerPermission(userID, parcel, (ulong)p, false);
        }
        /// <summary>
@@ -1177,18 +1415,18 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        /// <param name="user"></param>
        /// <param name="scene"></param>
        /// <returns></returns>
-        private bool CanEditScript(UUID script, UUID objectID, UUID user, Scene scene)
+        private bool CanEditScript(UUID script, UUID objectID, UUID userID)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            if (m_allowedScriptEditors == UserSet.Administrators && !IsAdministrator(user))
+            if (m_allowedScriptEditors == UserSet.Administrators && !IsAdministrator(userID))
                return false;
            // Ordinarily, if you can view it, you can edit it
            // There is no viewing a no mod script
            //
-            return CanViewScript(script, objectID, user, scene);
+            return CanViewScript(script, objectID, userID);
        }
        /// <summary>
@@ -1199,7 +1437,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        /// <param name="user"></param>
        /// <param name="scene"></param>
        /// <returns></returns>
-        private bool CanEditNotecard(UUID notecard, UUID objectID, UUID user, Scene scene)
+        private bool CanEditNotecard(UUID notecard, UUID objectID, UUID user)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1230,69 +1468,68 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            }
            else // Prim inventory
            {
-                SceneObjectPart part = scene.GetSceneObjectPart(objectID);
+                SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
                if (part == null)
                    return false;
-                if (part.OwnerID != user)
+                SceneObjectGroup sog = part.ParentGroup;
-                {
+                if (sog == null)
-                    if (part.GroupID == UUID.Zero)
+                    return false;
-                        return false;
-                    if (!IsGroupMember(part.GroupID, user, 0))
-                        return false;
-                    if ((part.GroupMask & (uint)PermissionMask.Modify) == 0)
+                // check object mod right
-                        return false;
+                uint perms = GetObjectPermissions(user, sog, true);
-                }
+                if((perms & (uint)PermissionMask.Modify) == 0)
-                else
-                {
-                    if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
                    return false;
-                }
                TaskInventoryItem ti = part.Inventory.GetInventoryItem(notecard);
                if (ti == null)
                    return false;
+               
                if (ti.OwnerID != user)
                {
-                    if (ti.GroupID == UUID.Zero)
+                    UUID tiGroupID = ti.GroupID;
+                    if (tiGroupID == UUID.Zero)
                        return false;
-                    if (!IsGroupMember(ti.GroupID, user, 0))
+                    ulong powers = 0;
+                    if(!GroupMemberPowers(tiGroupID, user, ref powers))
                        return false;
+                    if(tiGroupID == ti.OwnerID && (powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                    {
+                        if ((ti.CurrentPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy)) ==
+                        ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy))
+                            return true;
+                    }
+                    if ((ti.GroupPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy)) ==
+                        ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy))
+                        return true;
+                    return false;
                }
                // Require full perms
-                if ((ti.CurrentPermissions &
+                if ((ti.CurrentPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy)) !=
-                        ((uint)PermissionMask.Modify |
+                        ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy))
-                        (uint)PermissionMask.Copy)) !=
-                        ((uint)PermissionMask.Modify |
-                        (uint)PermissionMask.Copy))
                    return false;
            }
            return true;
        }
-        private bool CanInstantMessage(UUID user, UUID target, Scene startScene)
+        private bool CanInstantMessage(UUID user, UUID target)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
            // If the sender is an object, check owner instead
            //
-            SceneObjectPart part = startScene.GetSceneObjectPart(user);
+            SceneObjectPart part = m_scene.GetSceneObjectPart(user);
            if (part != null)
                user = part.OwnerID;
            return GenericCommunicationPermission(user, target);
        }
-        private bool CanInventoryTransfer(UUID user, UUID target, Scene startScene)
+        private bool CanInventoryTransfer(UUID user, UUID target)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1300,7 +1537,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            return GenericCommunicationPermission(user, target);
        }
-        private bool CanIssueEstateCommand(UUID user, Scene requestFromScene, bool ownerCommand)
+        private bool CanIssueEstateCommand(UUID user, bool ownerCommand)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1308,178 +1545,113 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            if (IsAdministrator(user))
                return true;
-            if (m_scene.RegionInfo.EstateSettings.IsEstateOwner(user))
-                return true;
            if (ownerCommand)
-                return false;
+                return m_scene.RegionInfo.EstateSettings.IsEstateOwner(user);
-            return GenericEstatePermission(user);
+            return IsEstateManager(user);
        }
-        private bool CanMoveObject(UUID objectID, UUID moverID, Scene scene)
+        private bool CanMoveObject(SceneObjectGroup sog, ScenePresence sp)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
-            if (m_bypassPermissions)
-            {
-                SceneObjectPart part = scene.GetSceneObjectPart(objectID);
-                if (part.OwnerID != moverID)
-                {
-                    if (!part.ParentGroup.IsDeleted)
-                    {
-                        if (part.ParentGroup.IsAttachment)
-                            return false;
-                    }
-                }
-                return m_bypassPermissionsValue;
-            }
-            bool permission = GenericObjectPermission(moverID, objectID, true);
-            if (!permission)
-            {
-                if (!m_scene.Entities.ContainsKey(objectID))
-                {
-                    return false;
-                }
-                // The client
-                // may request to edit linked parts, and therefore, it needs
-                // to also check for SceneObjectPart
-                // If it's not an object, we cant edit it.
-                if ((!(m_scene.Entities[objectID] is SceneObjectGroup)))
-                {
-                    return false;
-                }
-                SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
-                // UUID taskOwner = null;
-                // Added this because at this point in time it wouldn't be wise for
-                // the administrator object permissions to take effect.
-                // UUID objectOwner = task.OwnerID;
-                // Anyone can move
+            if(sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
-                if ((task.RootPart.EveryoneMask & PERM_MOVE) != 0)
+                return false;
-                    permission = true;
-                // Locked
+            if (m_bypassPermissions)
-                if ((task.RootPart.OwnerMask & PERM_LOCKED) == 0)
-                    permission = false;
-            }
-            else
            {
-                bool locked = false;
+                if (sog.OwnerID != sp.UUID && sog.IsAttachment)
-                if (!m_scene.Entities.ContainsKey(objectID))
-                {
-                    return false;
-                }
-                // If it's not an object, we cant edit it.
-                if ((!(m_scene.Entities[objectID] is SceneObjectGroup)))
-                {
-                    return false;
-                }
-                SceneObjectGroup group = (SceneObjectGroup)m_scene.Entities[objectID];
-                UUID objectOwner = group.OwnerID;
-                locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0);
-                // This is an exception to the generic object permission.
-                // Administrators who lock their objects should not be able to move them,
-                // however generic object permission should return true.
-                // This keeps locked objects from being affected by random click + drag actions by accident
-                // and allows the administrator to grab or delete a locked object.
-                // Administrators and estate managers are still able to click+grab locked objects not
-                // owned by them in the scene
-                // This is by design.
-                if (locked && (moverID == objectOwner))
                    return false;
+                return m_bypassPermissionsValue;
            }
-            return permission;
+            uint perms = GetObjectPermissions(sp, sog, true);
+            if((perms & (uint)PermissionMask.Move) == 0)
+                return false;
+            return true;
        }
-        private bool CanObjectEntry(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene)
+        private bool CanObjectEntry(SceneObjectGroup sog, bool enteringRegion, Vector3 newPoint)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
-            if (m_bypassPermissions) return m_bypassPermissionsValue;
+            float newX = newPoint.X;
+            float newY = newPoint.Y;
-            // allow outide region??
+            // allow outside region this is needed for crossings
-            if (newPoint.X < -1f || newPoint.Y < -1f)
+            if (newX < -1f || newX > (m_scene.RegionInfo.RegionSizeX + 1.0f) ||
+                newY < -1f || newY > (m_scene.RegionInfo.RegionSizeY + 1.0f) )
                return true;
-            if (newPoint.X > scene.RegionInfo.RegionSizeX + 1.0f ||  newPoint.Y > scene.RegionInfo.RegionSizeY + 1.0f)
-            {
-                return true;
-            }
-            SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
+            if(sog == null || sog.IsDeleted)
+                return false;
+            if (m_bypassPermissions)
+                return m_bypassPermissionsValue;
+            ILandObject parcel = m_scene.LandChannel.GetLandObject(newX, newY);
+            if (parcel == null)
+                return false;
-            ILandObject land = m_scene.LandChannel.GetLandObject(newPoint.X, newPoint.Y);
+            if ((parcel.LandData.Flags & ((int)ParcelFlags.AllowAPrimitiveEntry)) != 0)
+                return true;
            if (!enteringRegion)
            {
-                ILandObject fromland = m_scene.LandChannel.GetLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y);
+                Vector3 oldPoint = sog.AbsolutePosition;
+                ILandObject fromparcel = m_scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y);
-                if (fromland == land) // Not entering
+                if (fromparcel != null && fromparcel.Equals(parcel)) // it already entered parcel ????
                    return true;
            }
-            if (land == null)
+            UUID userID = sog.OwnerID;
-            {
+            LandData landdata = parcel.LandData;
-                return false;
-            }
-            if ((land.LandData.Flags & ((int)ParcelFlags.AllowAPrimitiveEntry)) != 0)
+            if (landdata.OwnerID == userID)
-            {
                return true;
-            }
-            if (!m_scene.Entities.ContainsKey(objectID))
+            if (IsAdministrator(userID))
-            {
+                return true;
-                return false;
-            }
-            // If it's not an object, we cant edit it.
+            UUID landGroupID = landdata.GroupID;
-            if (!(m_scene.Entities[objectID] is SceneObjectGroup))
+            if (landGroupID != UUID.Zero)
            {
-                return false;
+                if ((parcel.LandData.Flags & ((int)ParcelFlags.AllowGroupObjectEntry)) != 0)
-            }
+                    return IsGroupMember(landGroupID, userID, 0);
-            if (GenericParcelPermission(task.OwnerID, newPoint, 0))
+                 if (landdata.IsGroupOwned && IsGroupMember(landGroupID, userID, (ulong)GroupPowers.AllowRez))
-            {
+                    return true;
-                return true;
            }
            //Otherwise, false!
            return false;
        }
-        private bool CanReturnObjects(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene)
+        private bool CanReturnObjects(ILandObject land, ScenePresence sp, List<SceneObjectGroup> objects)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            GroupPowers powers;
+            if(sp == null)
-            ILandObject l;
+                return true;  // assuming that in this case rights are as owner
-            ScenePresence sp = scene.GetScenePresence(user);
+            UUID userID = sp.UUID;
-            if (sp == null)
+            bool isPrivUser = sp.IsGod || IsEstateManager(userID);
-                return false;
            IClientAPI client = sp.ControllingClient;
+            ulong powers = 0;
+            ILandObject l;
            foreach (SceneObjectGroup g in new List<SceneObjectGroup>(objects))
            {
-                // Any user can return their own objects at any time
+                if(g.IsAttachment)
-                //
+                {
-                if (GenericObjectPermission(user, g.UUID, false))
+                    objects.Remove(g);
+                    continue;
+                }
+                if (isPrivUser || g.OwnerID == userID)
                    continue;
                // This is a short cut for efficiency. If land is non-null,
@@ -1493,39 +1665,40 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                else
                {
                    Vector3 pos = g.AbsolutePosition;
+                    l = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
-                    l = scene.LandChannel.GetLandObject(pos.X, pos.Y);
                }
                // If it's not over any land, then we can't do a thing
-                if (l == null)
+                if (l == null || l.LandData == null)
                {
                    objects.Remove(g);
                    continue;
                }
+                LandData ldata = l.LandData;
                // If we own the land outright, then allow
                //
-                if (l.LandData.OwnerID == user)
+                if (ldata.OwnerID == userID)
                    continue;
                // Group voodoo
                //
-                if (l.LandData.IsGroupOwned)
+                if (ldata.IsGroupOwned)
                {
-                    powers = (GroupPowers)client.GetGroupPowers(l.LandData.GroupID);
+                    UUID lGroupID = ldata.GroupID;
                    // Not a group member, or no rights at all
                    //
-                    if (powers == (GroupPowers)0)
+                    powers = client.GetGroupPowers(lGroupID);
+                    if(powers == 0)
                    {
                        objects.Remove(g);
                        continue;
                    }
+ 
                    // Group deeded object?
                    //
-                    if (g.OwnerID == l.LandData.GroupID &&
+                    if (g.OwnerID == lGroupID &&
-                        (powers & GroupPowers.ReturnGroupOwned) == (GroupPowers)0)
+                        (powers & (ulong)GroupPowers.ReturnGroupOwned) == 0)
                    {
                        objects.Remove(g);
                        continue;
@@ -1533,14 +1706,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                    // Group set object?
                    //
-                    if (g.GroupID == l.LandData.GroupID &&
+                    if (g.GroupID == lGroupID &&
-                        (powers & GroupPowers.ReturnGroupSet) == (GroupPowers)0)
+                        (powers & (ulong)GroupPowers.ReturnGroupSet) == 0)
                    {
                        objects.Remove(g);
                        continue;
                    }
-                    if ((powers & GroupPowers.ReturnNonGroup) == (GroupPowers)0)
+                    if ((powers & (ulong)GroupPowers.ReturnNonGroup) == 0)
                    {
                        objects.Remove(g);
                        continue;
@@ -1563,7 +1736,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            return true;
        }
-        private bool CanRezObject(int objectCount, UUID owner, Vector3 objectPosition, Scene scene)
+        private bool CanRezObject(int objectCount, UUID userID, Vector3 objectPosition)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions)
@@ -1576,28 +1749,28 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                return false;
            LandData landdata = parcel.LandData;
-            if ((owner == landdata.OwnerID))
+            if ((userID == landdata.OwnerID))
                return true;
            if ((landdata.Flags & (uint)ParcelFlags.CreateObjects) != 0)
                return true;
-            if(IsAdministrator(owner))
+            if(IsAdministrator(userID))
                return true;
            if(landdata.GroupID != UUID.Zero)
            {
                if ((landdata.Flags & (uint)ParcelFlags.CreateGroupObjects) != 0)
-                    return IsGroupMember(landdata.GroupID, owner, 0);
+                    return IsGroupMember(landdata.GroupID, userID, 0);
-                if (landdata.IsGroupOwned && IsGroupMember(landdata.GroupID, owner, (ulong)GroupPowers.AllowRez))
+                if (landdata.IsGroupOwned && IsGroupMember(landdata.GroupID, userID, (ulong)GroupPowers.AllowRez))
                    return true;
            }
            return false;
        }
-        private bool CanRunConsoleCommand(UUID user, Scene requestFromScene)
+        private bool CanRunConsoleCommand(UUID user)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1606,15 +1779,43 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            return IsAdministrator(user);
        }
-        private bool CanRunScript(UUID script, UUID objectID, UUID user, Scene scene)
+        private bool CanRunScript(TaskInventoryItem scriptitem, SceneObjectPart part)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            return true;
+            if(scriptitem == null || part == null)
+                return false;
+            SceneObjectGroup sog = part.ParentGroup;
+            if(sog == null)
+                return false;
+            Vector3 pos = sog.AbsolutePosition;
+            ILandObject parcel = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
+            if (parcel == null)
+                return false;
+            LandData ldata = parcel.LandData;
+            if(ldata == null)
+                return false;
+            uint lflags = ldata.Flags;
+ 
+            if ((lflags & (uint)ParcelFlags.AllowOtherScripts) != 0)
+               return true;
+            if ((part.OwnerID == ldata.OwnerID))
+                return true;
+            if (((lflags & (uint)ParcelFlags.AllowGroupScripts) != 0)
+                    && (ldata.GroupID != UUID.Zero) && (ldata.GroupID == part.GroupID))
+                return true;
+            
+            return GenericEstatePermission(part.OwnerID);
        }
-        private bool CanSellParcel(UUID user, ILandObject parcel, Scene scene)
+        private bool CanSellParcel(UUID user, ILandObject parcel)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1622,7 +1823,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandSetSale, true);
        }
-        private bool CanSellGroupObject(UUID userID, UUID groupID, Scene scene)
+        private bool CanSellGroupObject(UUID userID, UUID groupID)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1630,66 +1831,159 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            return IsGroupMember(groupID, userID, (ulong)GroupPowers.ObjectSetForSale);
        }
-        private bool CanTakeObject(UUID objectID, UUID stealer, Scene scene)
+        private bool CanSellObjectByUserID(SceneObjectGroup sog, UUID userID, byte saleType)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            return GenericObjectPermission(stealer,objectID, false);
+            if (sog == null || sog.IsDeleted || userID == UUID.Zero)
+                return false;
+            // sell is not a attachment op
+            if(sog.IsAttachment)
+                return false;
+            if(IsAdministrator(userID))
+                return true;
+            uint sogEffectiveOwnerPerms = sog.EffectiveOwnerPerms;
+            if((sogEffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
+                return false;
+            if(saleType == (byte)SaleType.Copy &&
+                    (sogEffectiveOwnerPerms & (uint)PermissionMask.Copy) == 0)
+                return false;
+            UUID sogOwnerID = sog.OwnerID;
+            if(sogOwnerID == userID)
+                return true;
+            // else only group owned can be sold by members with powers
+            UUID sogGroupID = sog.GroupID;
+            if(sog.OwnerID != sogGroupID || sogGroupID == UUID.Zero)
+                return false;
+            return IsGroupMember(sogGroupID, userID, (ulong)GroupPowers.ObjectSetForSale);
        }
-        private bool CanTakeCopyObject(UUID objectID, UUID userID, Scene inScene)
+        private bool CanSellObject(SceneObjectGroup sog, ScenePresence sp, byte saleType)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            bool permission = GenericObjectPermission(userID, objectID, false);
+            if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
+                return false;
-            SceneObjectGroup so = (SceneObjectGroup)m_scene.Entities[objectID];
+            // sell is not a attachment op
+            if(sog.IsAttachment)
+                return false;
-            if (!permission)
+            if(sp.IsGod)
-            {
+                return true;
-                if (!m_scene.Entities.ContainsKey(objectID))
-                {
-                    return false;
-                }
-                // If it's not an object, we cant edit it.
+            uint sogEffectiveOwnerPerms = sog.EffectiveOwnerPerms;
-                if (!(m_scene.Entities[objectID] is SceneObjectGroup))
+            if((sogEffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
-                {
+                return false;
-                    return false;
-                }
-                // UUID taskOwner = null;
+            if(saleType == (byte)SaleType.Copy &&
-                // Added this because at this point in time it wouldn't be wise for
+                    (sogEffectiveOwnerPerms & (uint)PermissionMask.Copy) == 0)
-                // the administrator object permissions to take effect.
+                return false;
-                // UUID objectOwner = task.OwnerID;
-                if ((so.RootPart.EveryoneMask & PERM_COPY) != 0)
+            UUID userID = sp.UUID;
-                    permission = true;
+            UUID sogOwnerID = sog.OwnerID;
-            }
-            if (so.OwnerID != userID)
+            if(sogOwnerID == userID)
-            {
+                return true;
-                if ((so.GetEffectivePermissions() & (PERM_COPY | PERM_TRANS)) != (PERM_COPY | PERM_TRANS))
-                    permission = false;
+            // else only group owned can be sold by members with powers
-            }
+            UUID sogGroupID = sog.GroupID;
-            else
+            if(sog.OwnerID != sogGroupID || sogGroupID == UUID.Zero)
+                return false;
+            ulong powers = 0;
+            if(!GroupMemberPowers(sogGroupID, sp, ref powers))
+                return false;
+            if((powers & (ulong)GroupPowers.ObjectSetForSale) == 0)
+                return false;
+            return true;
+        }
+        private bool CanTakeObject(SceneObjectGroup sog, ScenePresence sp)
+        {
+            // ignore locked, viewers shell ask for confirmation
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
+            if (m_bypassPermissions) return m_bypassPermissionsValue;
+            if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
+                return false;
+            // take is not a attachment op
+            if(sog.IsAttachment)
+                return false;
+            UUID sogOwnerID = sog.OwnerID;
+            UUID spID = sp.UUID;
+            if(sogOwnerID == spID)
+                return true;
+            if (sp.IsGod)
+                return true;
+            if((sog.EffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
+                return false;
+ 
+            if (IsFriendWithPerms(sog.UUID, sogOwnerID))
+                return true;
+            UUID sogGroupID = sog.GroupID;
+            if (sogGroupID != UUID.Zero)
            {
-                if ((so.GetEffectivePermissions() & PERM_COPY) != PERM_COPY)
+                ulong powers = 0;
-                    permission = false;
+                if(GroupMemberPowers(sogGroupID, sp, ref powers))
+                {
+                    if(sogGroupID == sogOwnerID)
+                    {
+                        if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                            return true;
+                    }
+                    return (sog.EffectiveGroupPerms & (uint)PermissionMask.Modify) != 0;
+                } 
            }
+            return false;
+        }
-            return permission;
+        private bool CanTakeCopyObject(SceneObjectGroup sog, ScenePresence sp)
+        {
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
+            if (m_bypassPermissions) return m_bypassPermissionsValue;
+            if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
+                return false;
+            // refuse on attachments
+            if(sog.IsAttachment && !sp.IsGod)
+                return false;
+            uint perms = GetObjectPermissions(sp, sog, true);
+            if((perms & (uint)PermissionMask.Copy) == 0)
+                return false;
+            if(sog.OwnerID != sp.UUID && (perms & (uint)PermissionMask.Transfer) == 0)
+                 return false;
+            return true;
        }
-        private bool CanTerraformLand(UUID user, Vector3 position, Scene requestFromScene)
+        private bool CanTerraformLand(UUID userID, Vector3 position)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
            // Estate override
-            if (GenericEstatePermission(user))
+            if (GenericEstatePermission(userID))
                return true;
            float X = position.X;
@@ -1707,13 +2001,19 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            ILandObject parcel = m_scene.LandChannel.GetLandObject(X, Y);
            if (parcel == null)
                return false;
+            
-            // Others allowed to terraform?
+            LandData landdata = parcel.LandData;
-            if ((parcel.LandData.Flags & ((int)ParcelFlags.AllowTerraform)) != 0)
+            if (landdata == null)
+                return false;
+            
+            if ((landdata.Flags & ((int)ParcelFlags.AllowTerraform)) != 0)
                return true;
-            // Land owner can terraform too
+            if(landdata.OwnerID == userID)
-            if (parcel != null && GenericParcelPermission(user, parcel, (ulong)GroupPowers.AllowEditLand))
+                return true;
+            
+            if (landdata.IsGroupOwned && parcel.LandData.GroupID != UUID.Zero &&  
+                    IsGroupMember(landdata.GroupID, userID, (ulong)GroupPowers.AllowEditLand))
                return true;
            return false;
@@ -1727,7 +2027,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        /// <param name="user"></param>
        /// <param name="scene"></param>
        /// <returns></returns>
-        private bool CanViewScript(UUID script, UUID objectID, UUID user, Scene scene)
+        private bool CanViewScript(UUID script, UUID objectID, UUID userID)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1739,7 +2039,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            if (objectID == UUID.Zero) // User inventory
            {
                IInventoryService invService = m_scene.InventoryService;
-                InventoryItemBase assetRequestItem = invService.GetItem(user, script);
+                InventoryItemBase assetRequestItem = invService.GetItem(userID, script);
                if (assetRequestItem == null && LibraryRootFolder != null) // Library item
                {
                    assetRequestItem = LibraryRootFolder.FindItem(script);
@@ -1759,60 +2059,53 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                // readable only if it's really full perms
                //
                if ((assetRequestItem.CurrentPermissions &
+/*
                        ((uint)PermissionMask.Modify |
                        (uint)PermissionMask.Copy |
                        (uint)PermissionMask.Transfer)) !=
                        ((uint)PermissionMask.Modify |
                        (uint)PermissionMask.Copy |
                        (uint)PermissionMask.Transfer))
+*/
+                        (uint)(PermissionMask.Modify | PermissionMask.Copy)) !=
+                        (uint)(PermissionMask.Modify | PermissionMask.Copy))
                    return false;
            }
            else // Prim inventory
            {
-                SceneObjectPart part = scene.GetSceneObjectPart(objectID);
+                SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
                if (part == null)
                    return false;
-                if (part.OwnerID != user)
+                SceneObjectGroup sog = part.ParentGroup;
-                {
+                if (sog == null)
-                    if (part.GroupID == UUID.Zero)
+                    return false;
-                        return false;
-                    if (!IsGroupMember(part.GroupID, user, 0))
-                        return false;
-                    if ((part.GroupMask & (uint)PermissionMask.Modify) == 0)
+                uint perms = GetObjectPermissions(userID, sog, true);
-                        return false;
+                if((perms & (uint)PermissionMask.Modify) == 0)
-                }
+                    return false;
-                else
-                {
-                    if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
-                        return false;
-                }
                TaskInventoryItem ti = part.Inventory.GetInventoryItem(script);
-                if (ti == null)
+//                if (ti == null || ti.InvType != (int)InventoryType.LSL)
+                if (ti == null) // legacy may not have type
                    return false;
-                if (ti.OwnerID != user)
+                uint itperms = GetObjectItemPermissions(userID, ti);
-                {
-                    if (ti.GroupID == UUID.Zero)
-                        return false;
-                    if (!IsGroupMember(ti.GroupID, user, 0))
-                        return false;
-                }
                // Require full perms
-                if ((ti.CurrentPermissions &
-                        ((uint)PermissionMask.Modify |
+                if ((itperms &
+/*
+                        ((uint)(PermissionMask.Modify |
                        (uint)PermissionMask.Copy |
                        (uint)PermissionMask.Transfer)) !=
                        ((uint)PermissionMask.Modify |
                        (uint)PermissionMask.Copy |
                        (uint)PermissionMask.Transfer))
+*/
+                        (uint)(PermissionMask.Modify | PermissionMask.Copy)) !=
+                        (uint)(PermissionMask.Modify | PermissionMask.Copy))
                    return false;
            }
@@ -1827,7 +2120,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        /// <param name="user"></param>
        /// <param name="scene"></param>
        /// <returns></returns>
-        private bool CanViewNotecard(UUID notecard, UUID objectID, UUID user, Scene scene)
+        private bool CanViewNotecard(UUID notecard, UUID objectID, UUID userID)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1839,7 +2132,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            if (objectID == UUID.Zero) // User inventory
            {
                IInventoryService invService = m_scene.InventoryService;
-                InventoryItemBase assetRequestItem = invService.GetItem(user, notecard);
+                InventoryItemBase assetRequestItem = invService.GetItem(userID, notecard);
                if (assetRequestItem == null && LibraryRootFolder != null) // Library item
                {
                    assetRequestItem = LibraryRootFolder.FindItem(notecard);
@@ -1857,40 +2150,29 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            }
            else // Prim inventory
            {
-                SceneObjectPart part = scene.GetSceneObjectPart(objectID);
+                SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
                if (part == null)
                    return false;
-                if (part.OwnerID != user)
+                SceneObjectGroup sog = part.ParentGroup;
-                {
+                if (sog == null)
-                    if (part.GroupID == UUID.Zero)
+                    return false;
-                        return false;
-                    if (!IsGroupMember(part.GroupID, user, 0))
-                        return false;
-                }
-                if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
+                uint perms = GetObjectPermissions(userID, sog, true);
+                if((perms & (uint)PermissionMask.Modify) == 0)
                    return false;
                TaskInventoryItem ti = part.Inventory.GetInventoryItem(notecard);
+//                if (ti == null || ti.InvType != (int)InventoryType.Notecard)
                if (ti == null)
                    return false;
-                if (ti.OwnerID != user)
+                uint itperms = GetObjectItemPermissions(userID, ti);
-                {
-                    if (ti.GroupID == UUID.Zero)
-                        return false;
-                    if (!IsGroupMember(ti.GroupID, user, 0))
-                        return false;
-                }
                // Notecards are always readable unless no copy
                //
-                if ((ti.CurrentPermissions &
+                if ((itperms &
                        (uint)PermissionMask.Copy) !=
                        (uint)PermissionMask.Copy)
                    return false;
@@ -1906,7 +2188,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            return GenericObjectPermission(userID, objectID, false);
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
+            if (sog == null)
+                return false;
+            uint perms = GetObjectPermissions(userID, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            return true;
        }
        private bool CanDelinkObject(UUID userID, UUID objectID)
@@ -1914,10 +2203,17 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            return GenericObjectPermission(userID, objectID, false);
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
+            if (sog == null)
+                return false;
+            uint perms = GetObjectPermissions(userID, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            return true;
        }
-        private bool CanBuyLand(UUID userID, ILandObject parcel, Scene scene)
+        private bool CanBuyLand(UUID userID, ILandObject parcel)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1930,6 +2226,130 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
+            SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
+            if (part == null)
+                return false;
+            SceneObjectGroup sog = part.ParentGroup;
+            if (sog == null)
+                return false;
+            uint perms = GetObjectPermissions(userID, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            TaskInventoryItem ti = part.Inventory.GetInventoryItem(itemID);
+            if(ti == null)
+                return false;
+            uint itperms = GetObjectItemPermissions(userID, ti);
+            if((itperms & (uint)PermissionMask.Copy) == 0)
+                return false;
+            if(sog.OwnerID != userID && (itperms & (uint)PermissionMask.Transfer) == 0)
+                return false;
+            return true;
+        }
+        // object inventory to object inventory item drag and drop
+        private bool CanDoObjectInvToObjectInv(TaskInventoryItem item, SceneObjectPart sourcePart, SceneObjectPart destPart)
+        {
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
+            if (sourcePart == null || destPart == null || item == null)
+                return false;
+            if (m_bypassPermissions)
+                return m_bypassPermissionsValue;
+            SceneObjectGroup srcsog = sourcePart.ParentGroup;
+            SceneObjectGroup destsog = destPart.ParentGroup;
+            if (srcsog == null || destsog == null)
+                return false;
+            // dest is locked
+            if((destsog.EffectiveOwnerPerms & (uint)PermissionMask.Move) == 0)
+                return false;
+            uint itperms = item.CurrentPermissions;
+            // if item is no copy the source is modifed
+            if((itperms & (uint)PermissionMask.Copy) == 0 && (srcsog.EffectiveOwnerPerms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            UUID srcOwner = srcsog.OwnerID;
+            UUID destOwner = destsog.OwnerID;
+            bool notSameOwner = srcOwner != destOwner;
+            if(notSameOwner)
+            {
+                if((itperms & (uint)PermissionMask.Transfer) == 0)
+                    return false;
+                // scripts can't be droped
+                if(item.InvType == (int)InventoryType.LSL)
+                    return false;
+                if((destsog.RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0)
+                    return false;
+            }
+            else
+            {
+                if((destsog.RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0 &&
+                            (destsog.EffectiveOwnerPerms & (uint)PermissionMask.Modify) == 0)
+                    return false;
+            }
+            return true;
+        }
+        private bool CanDropInObjectInv(InventoryItemBase item, ScenePresence sp, SceneObjectPart destPart)
+        {
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
+            if (sp == null || sp.IsDeleted || destPart == null || item == null)
+                return false;
+            SceneObjectGroup destsog = destPart.ParentGroup;
+            if (destsog == null || destsog.IsDeleted)
+                return false;
+            if (m_bypassPermissions)
+                return m_bypassPermissionsValue;
+            if(sp.IsGod)
+                return true;
+            // dest is locked
+            if((destsog.EffectiveOwnerPerms & (uint)PermissionMask.Move) == 0)
+                return false;
+            UUID destOwner = destsog.OwnerID;
+            UUID spID = sp.UUID;
+            bool spNotOwner = spID != destOwner;
+            // scripts can't be droped
+            if(spNotOwner && item.InvType == (int)InventoryType.LSL)
+                return false;
+            if(spNotOwner || item.Owner != destOwner)
+            {
+                // no copy item will be moved if it has transfer
+                uint itperms = item.CurrentPermissions;
+                if((itperms & (uint)PermissionMask.Transfer) == 0)
+                    return false;
+            }
+            // allowdrop is a root part thing and does bypass modify rights
+            if((destsog.RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) != 0)
+                return true;
+            uint perms = GetObjectPermissions(spID, destsog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
            return true;
        }
@@ -1938,6 +2358,23 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
+            SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
+            if (part == null)
+                return false;
+            SceneObjectGroup sog = part.ParentGroup;
+            if (sog == null)
+                return false;
+            uint perms = GetObjectPermissions(userID, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            TaskInventoryItem ti = part.Inventory.GetInventoryItem(itemID);
+            if(ti == null)
+                return false;
+            //TODO item perm ?
            return true;
        }
@@ -1954,26 +2391,23 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
            ScenePresence p = m_scene.GetScenePresence(userID);
-            if (part == null || p == null)
+            if (p == null)
+                return false;
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
+            if (sog == null)
+                return false;
+            uint perms = GetObjectPermissions(userID, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
                return false;
-            if (!IsAdministrator(userID))
+            if ((int)InventoryType.LSL == invType)
            {
-                if (part.OwnerID != userID)
+                if (m_allowedScriptCreators == UserSet.Administrators)
-                {
+                 return false;
-                    // Group permissions
-                    if ((part.GroupID == UUID.Zero) || (p.ControllingClient.GetGroupPowers(part.GroupID) == 0) || ((part.GroupMask & (uint)PermissionMask.Modify) == 0))
-                        return false;
-                } else {
-                    if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
-                        return false;
-                }
-                if ((int)InventoryType.LSL == invType)
-                    if (m_allowedScriptCreators == UserSet.Administrators)
-                        return false;
            }
            return true;
@@ -2047,22 +2481,22 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            return true;
        }
-        private bool CanResetScript(UUID prim, UUID script, UUID agentID, Scene scene)
+        private bool CanResetScript(UUID primID, UUID script, UUID agentID)
        {
            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
            if (m_bypassPermissions) return m_bypassPermissionsValue;
-            SceneObjectPart part = m_scene.GetSceneObjectPart(prim);
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(primID);
+            if (sog == null)
-            // If we selected a sub-prim to reset, prim won't represent the object, but only a part.
+                return false;
-            // We have to check the permissions of the object, though.
-            if (part.ParentID != 0) prim = part.ParentUUID;
-            // You can reset the scripts in any object you can edit
+            uint perms = GetObjectPermissions(agentID, sog, false);
-            return GenericObjectPermission(agentID, prim, false);
+            if((perms & (uint)PermissionMask.Modify) == 0) // ??
+                return false;
+            return true;
        }
-        private bool CanCompileScript(UUID ownerUUID, int scriptType, Scene scene)
+        private bool CanCompileScript(UUID ownerUUID, int scriptType)
        {
             //m_log.DebugFormat("check if {0} is allowed to compile {1}", ownerUUID, scriptType);
            switch (scriptType) {
@@ -2120,7 +2554,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 //                "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}",
 //                agentID, primID, face, me.ControlPermissions);
-            return GenericObjectPermission(agentID, part.ParentGroup.UUID, true);
+            SceneObjectGroup sog = part.ParentGroup;
+            if (sog == null)
+                return false;
+            uint perms = GetObjectPermissions(agentID, sog, false);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            return true;
        }
        private bool CanInteractWithPrimMedia(UUID agentID, UUID primID, int face)
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index 04b6f00..167f6b5 100644
--- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -105,8 +105,9 @@ namespace OpenSim.Region.CoreModules.World.Vegetation
            if (rootPart.Shape.PCode != (byte)PCode.Grass)
                AdaptTree(ref shape);
-            m_scene.AddNewSceneObject(sceneObject, true);
            sceneObject.SetGroup(groupID, null);
+            m_scene.AddNewSceneObject(sceneObject, true);
+            sceneObject.AggregatePerms();
            return sceneObject;
        }
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 0c4017e..e7c2428 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -278,6 +278,8 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="datastore"></param>
        void ProcessInventoryBackup(ISimulationDataService datastore);
+        void AggregateInnerPerms(ref uint owner, ref uint group, ref uint everyone);
        uint MaskEffectivePermissions();
        void ApplyNextOwnerPermissions();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index c1faf21..2f016fa 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -338,6 +338,7 @@ namespace OpenSim.Region.Framework.Scenes
            // Update item with new asset
            item.AssetID = asset.FullID;
            group.UpdateInventoryItem(item);
+            group.AggregatePerms();
            part.SendPropertiesToClient(remoteClient);
@@ -1214,6 +1215,7 @@ namespace OpenSim.Region.Framework.Scenes
                    }
                    group.RemoveInventoryItem(localID, itemID);
+                    group.AggregatePerms();
                }
                part.SendPropertiesToClient(remoteClient);
@@ -1378,18 +1380,10 @@ namespace OpenSim.Region.Framework.Scenes
                return;
            }
-            if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
+            if (!Permissions.CanCopyObjectInventory(itemId, part.UUID, remoteClient.AgentId))
            {
-                // If the item to be moved is no copy, we need to be able to
+                // check also if we can delete the no copy item
-                // edit the prim.
+                if(!Permissions.CanEditObject(part.UUID, remoteClient.AgentId))
-                if (!Permissions.CanEditObjectInventory(part.UUID, remoteClient.AgentId))
-                    return;
-            }
-            else
-            {
-                // If the item is copiable, then we just need to have perms
-                // on it. The delete check is a pure rights check
-                if (!Permissions.CanDeleteObject(part.UUID, remoteClient.AgentId))
                    return;
            }
@@ -1467,28 +1461,8 @@ namespace OpenSim.Region.Framework.Scenes
                return;
            }
-            // Can't transfer this
+            if(!Permissions.CanDoObjectInvToObjectInv(srcTaskItem, part, destPart))
-            //
-            if (part.OwnerID != destPart.OwnerID && (srcTaskItem.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
-                return;
-            bool overrideNoMod = false;
-            if ((part.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) != 0)
-                overrideNoMod = true;
-            if (part.OwnerID != destPart.OwnerID && (destPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0)
-            {
-                // object cannot copy items to an object owned by a different owner
-                // unless llAllowInventoryDrop has been called
-                return;
-            }
-            // must have both move and modify permission to put an item in an object
-            if (((part.OwnerMask & (uint)PermissionMask.Modify) == 0) && (!overrideNoMod))
-            {
                return;
-            }
            TaskInventoryItem destTaskItem = new TaskInventoryItem();
@@ -1530,9 +1504,10 @@ namespace OpenSim.Region.Framework.Scenes
            destTaskItem.Type = srcTaskItem.Type;
            destPart.Inventory.AddInventoryItem(destTaskItem, part.OwnerID != destPart.OwnerID);
            if ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
+            {
                part.Inventory.RemoveInventoryItem(itemId);
+            }
            ScenePresence avatar;
@@ -1670,76 +1645,79 @@ namespace OpenSim.Region.Framework.Scenes
                                        uint primLocalID)
        {
            UUID itemID = itemInfo.ItemID;
+            if (itemID == UUID.Zero)
+            {
+                m_log.ErrorFormat(
+                            "[PRIM INVENTORY]: UpdateTaskInventory called with item ID Zero on update for {1}!",
+                            remoteClient.Name);
+                return;
+            }
            // Find the prim we're dealing with
            SceneObjectPart part = GetSceneObjectPart(primLocalID);
+            if(part == null)
+            {
+                m_log.WarnFormat(
+                    "[PRIM INVENTORY]: " +
+                    "Update with item {0} requested of prim {1} for {2} but this prim does not exist",
+                    itemID, primLocalID, remoteClient.Name);
+                    return;
+            }
-            if (part != null)
+            TaskInventoryItem currentItem = part.Inventory.GetInventoryItem(itemID);
+            if (currentItem == null)
            {
-                TaskInventoryItem currentItem = part.Inventory.GetInventoryItem(itemID);
+                InventoryItemBase item = InventoryService.GetItem(remoteClient.AgentId, itemID);
-                bool allowInventoryDrop = (part.GetEffectiveObjectFlags()
-                                           & (uint)PrimFlags.AllowInventoryDrop) != 0;
-                // Explicity allow anyone to add to the inventory if the
+                // if not found Try library
-                // AllowInventoryDrop flag has been set. Don't however let
+                if (item == null && LibraryService != null && LibraryService.LibraryRootFolder != null)
-                // them update an item unless they pass the external checks
+                    item = LibraryService.LibraryRootFolder.FindItem(itemID);
-                //
-                if (!Permissions.CanEditObjectInventory(part.UUID, remoteClient.AgentId)
-                    && (currentItem != null || !allowInventoryDrop))
-                    return;
-                if (currentItem == null)
+                if(item == null)
                {
-                    UUID copyID = UUID.Random();
+                    m_log.ErrorFormat(
-                    if (itemID != UUID.Zero)
+                            "[PRIM INVENTORY]: Could not find inventory item {0} to update for {1}!",
-                    {
+                            itemID, remoteClient.Name);
-                        InventoryItemBase item = InventoryService.GetItem(remoteClient.AgentId, itemID);
+                    return;
+                }
-                        // Try library
+                if (!Permissions.CanDropInObjectInv(item, remoteClient, part))
-                        if (null == item && LibraryService != null && LibraryService.LibraryRootFolder != null)
+                    return;
-                        {
-                            item = LibraryService.LibraryRootFolder.FindItem(itemID);
-                        }
-                        // If we've found the item in the user's inventory or in the library
+                UUID copyID = UUID.Random();
-                        if (item != null)
+                bool modrights = Permissions.CanEditObject(part.ParentGroup, remoteClient);
-                        {
+                part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID, modrights);
-                            part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID);
+                m_log.InfoFormat(
-                            m_log.InfoFormat(
+                    "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}",
-                                "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}",
+                    item.Name, primLocalID, remoteClient.Name);
-                                item.Name, primLocalID, remoteClient.Name);
+                part.SendPropertiesToClient(remoteClient);
-                            part.SendPropertiesToClient(remoteClient);
+                if (!Permissions.BypassPermissions())
-                            if (!Permissions.BypassPermissions())
+                {
-                            {
+                    if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
-                                if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
+                    {
-                                {
+                        List<UUID> uuids = new List<UUID>();
-                                    List<UUID> uuids = new List<UUID>();
+                        uuids.Add(itemID);
-                                    uuids.Add(itemID);
+                        RemoveInventoryItem(remoteClient, uuids);
-                                    RemoveInventoryItem(remoteClient, uuids);
-                                }
-                            }
-                        }
-                        else
-                        {
-                            m_log.ErrorFormat(
-                                "[PRIM INVENTORY]: Could not find inventory item {0} to update for {1}!",
-                                itemID, remoteClient.Name);
-                        }
                    }
                }
-                else // Updating existing item with new perms etc
+            }
-                {
+            else // Updating existing item with new perms etc
+            {
 //                    m_log.DebugFormat(
 //                        "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()",
 //                        currentItem.Name, part.Name);
-                    // Only look for an uploaded updated asset if we are passed a transaction ID.  This is only the
+                if (!Permissions.CanEditObjectInventory(part.UUID, remoteClient.AgentId))
-                    // case for updates uploded through UDP.  Updates uploaded via a capability (e.g. a script update)
+                    return;
-                    // will not pass in a transaction ID in the update message.
-                    if (transactionID != UUID.Zero && AgentTransactionsModule != null)
+                // Only look for an uploaded updated asset if we are passed a transaction ID.  This is only the
-                    {
+                // case for updates uploded through UDP.  Updates uploaded via a capability (e.g. a script update)
-                        AgentTransactionsModule.HandleTaskItemUpdateFromTransaction(
+                // will not pass in a transaction ID in the update message.
-                            remoteClient, part, transactionID, currentItem);
+                if (transactionID != UUID.Zero && AgentTransactionsModule != null)
+                {
+                    AgentTransactionsModule.HandleTaskItemUpdateFromTransaction(
+                        remoteClient, part, transactionID, currentItem);
 //                        if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
 //                            remoteClient.SendAgentAlertMessage("Notecard saved", false);
@@ -1747,49 +1725,30 @@ namespace OpenSim.Region.Framework.Scenes
 //                            remoteClient.SendAgentAlertMessage("Script saved", false);
 //                        else
 //                            remoteClient.SendAgentAlertMessage("Item saved", false);
-                    }
+                }
-                    // Base ALWAYS has move
+                // Base ALWAYS has move
-                    currentItem.BasePermissions |= (uint)PermissionMask.Move;
+                currentItem.BasePermissions |= (uint)PermissionMask.Move;
-                    itemInfo.Flags = currentItem.Flags;
+                itemInfo.Flags = currentItem.Flags;
-                    // Check if we're allowed to mess with permissions
+                // Check if we're allowed to mess with permissions
-                    if (!Permissions.IsGod(remoteClient.AgentId)) // Not a god
+                if (!Permissions.IsGod(remoteClient.AgentId)) // Not a god
+                {
+                    if (remoteClient.AgentId != part.OwnerID) // Not owner
                    {
-                        if (remoteClient.AgentId != part.OwnerID) // Not owner
+                        // Friends and group members can't change any perms
-                        {
+                        itemInfo.BasePermissions = currentItem.BasePermissions;
-                            // Friends and group members can't change any perms
+                        itemInfo.EveryonePermissions = currentItem.EveryonePermissions;
-                            itemInfo.BasePermissions = currentItem.BasePermissions;
+                        itemInfo.GroupPermissions = currentItem.GroupPermissions;
-                            itemInfo.EveryonePermissions = currentItem.EveryonePermissions;
+                        itemInfo.NextPermissions = currentItem.NextPermissions;
-                            itemInfo.GroupPermissions = currentItem.GroupPermissions;
+                        itemInfo.CurrentPermissions = currentItem.CurrentPermissions;
-                            itemInfo.NextPermissions = currentItem.NextPermissions;
-                            itemInfo.CurrentPermissions = currentItem.CurrentPermissions;
-                        }
-                        else
-                        {
-                            // Owner can't change base, and can change other
-                            // only up to base
-                            itemInfo.BasePermissions = currentItem.BasePermissions;
-                            if (itemInfo.EveryonePermissions != currentItem.EveryonePermissions)
-                                itemInfo.Flags |= (uint)InventoryItemFlags.ObjectOverwriteEveryone;
-                            if (itemInfo.GroupPermissions != currentItem.GroupPermissions)
-                                itemInfo.Flags |= (uint)InventoryItemFlags.ObjectOverwriteGroup;
-                            if (itemInfo.CurrentPermissions != currentItem.CurrentPermissions)
-                                itemInfo.Flags |= (uint)InventoryItemFlags.ObjectOverwriteOwner;
-                            if (itemInfo.NextPermissions != currentItem.NextPermissions)
-                                itemInfo.Flags |= (uint)InventoryItemFlags.ObjectOverwriteNextOwner;
-                            itemInfo.EveryonePermissions &= currentItem.BasePermissions;
-                            itemInfo.GroupPermissions &= currentItem.BasePermissions;
-                            itemInfo.CurrentPermissions &= currentItem.BasePermissions;
-                            itemInfo.NextPermissions &= currentItem.BasePermissions;
-                        }
                    }
                    else
                    {
-                        if (itemInfo.BasePermissions != currentItem.BasePermissions)
+                        // Owner can't change base, and can change other
-                            itemInfo.Flags |= (uint)InventoryItemFlags.ObjectOverwriteBase;
+                        // only up to base
+                        itemInfo.BasePermissions = currentItem.BasePermissions;
                        if (itemInfo.EveryonePermissions != currentItem.EveryonePermissions)
                            itemInfo.Flags |= (uint)InventoryItemFlags.ObjectOverwriteEveryone;
                        if (itemInfo.GroupPermissions != currentItem.GroupPermissions)
@@ -1798,24 +1757,35 @@ namespace OpenSim.Region.Framework.Scenes
                            itemInfo.Flags |= (uint)InventoryItemFlags.ObjectOverwriteOwner;
                        if (itemInfo.NextPermissions != currentItem.NextPermissions)
                            itemInfo.Flags |= (uint)InventoryItemFlags.ObjectOverwriteNextOwner;
+                        itemInfo.EveryonePermissions &= currentItem.BasePermissions;
+                        itemInfo.GroupPermissions &= currentItem.BasePermissions;
+                        itemInfo.CurrentPermissions &= currentItem.BasePermissions;
+                        itemInfo.NextPermissions &= currentItem.BasePermissions;
                    }
-                    // Next ALWAYS has move
+                }
-                    itemInfo.NextPermissions |= (uint)PermissionMask.Move;
+                else
+                {
+                    if (itemInfo.BasePermissions != currentItem.BasePermissions)
+                        itemInfo.Flags |= (uint)InventoryItemFlags.ObjectOverwriteBase;
+                    if (itemInfo.EveryonePermissions != currentItem.EveryonePermissions)
+                        itemInfo.Flags |= (uint)InventoryItemFlags.ObjectOverwriteEveryone;
+                    if (itemInfo.GroupPermissions != currentItem.GroupPermissions)
+                        itemInfo.Flags |= (uint)InventoryItemFlags.ObjectOverwriteGroup;
+                    if (itemInfo.CurrentPermissions != currentItem.CurrentPermissions)
+                        itemInfo.Flags |= (uint)InventoryItemFlags.ObjectOverwriteOwner;
+                    if (itemInfo.NextPermissions != currentItem.NextPermissions)
+                        itemInfo.Flags |= (uint)InventoryItemFlags.ObjectOverwriteNextOwner;
+                }
-                    if (part.Inventory.UpdateInventoryItem(itemInfo))
+                // Next ALWAYS has move
-                    {
+                itemInfo.NextPermissions |= (uint)PermissionMask.Move;
-                        part.SendPropertiesToClient(remoteClient);
-                    }
+                if (part.Inventory.UpdateInventoryItem(itemInfo))
+                {
+                    part.SendPropertiesToClient(remoteClient);
                }
            }
-            else
-            {
-                m_log.WarnFormat(
-                    "[PRIM INVENTORY]: " +
-                    "Update with item {0} requested of prim {1} for {2} but this prim does not exist",
-                    itemID, primLocalID, remoteClient.Name);
-            }
        }
        /// <summary>
@@ -1978,6 +1948,8 @@ namespace OpenSim.Region.Framework.Scenes
            part.Inventory.AddInventoryItem(taskItem, false);
            part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0);
+            part.ParentGroup.AggregatePerms();
            // tell anyone managing scripts that a new script exists
            EventManager.TriggerNewScript(agentID, part, taskItem.ItemID);
@@ -2113,13 +2085,20 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name='action'>DeRezAction</param>
        /// <param name='destinationID'>User folder ID to place derezzed object</param>
        public virtual void DeRezObjects(
-            IClientAPI remoteClient, List<uint> localIDs, UUID groupID, DeRezAction action, UUID destinationID)
+            IClientAPI remoteClient, List<uint> localIDs, UUID groupID, DeRezAction action, UUID destinationID, bool AddToReturns = true)
        {
            // First, see of we can perform the requested action and
            // build a list of eligible objects
            List<uint> deleteIDs = new List<uint>();
            List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>();
            List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>();
+            List<SceneObjectGroup> takeDeleteGroups = new List<SceneObjectGroup>();
+            ScenePresence sp = null;
+            if(remoteClient != null)
+                sp = remoteClient.SceneAgent as ScenePresence;
+            else if(action != DeRezAction.Return)
+                return; // only Return can be called without a client
            // Start with true for both, then remove the flags if objects
            // that we can't derez are part of the selection
@@ -2175,17 +2154,17 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    if (action == DeRezAction.TakeCopy)
                    {
-                        if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
+                        if (!Permissions.CanTakeCopyObject(grp, sp))
                            permissionToTakeCopy = false;
                    }
                    else
                    {
                        permissionToTakeCopy = false;
                    }
-                    if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
+                    if (!Permissions.CanTakeObject(grp, sp))
                        permissionToTake = false;
-                    if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId))
+                    if (!Permissions.CanDeleteObject(grp, remoteClient))
                        permissionToDelete = false;
                }
@@ -2226,13 +2205,14 @@ namespace OpenSim.Region.Framework.Scenes
                    {
                        if (Permissions.CanReturnObjects(
                                        null,
-                                        remoteClient.AgentId,
+                                        remoteClient,
                                        new List<SceneObjectGroup>() {grp}))
                        {
                            permissionToTake = true;
                            permissionToDelete = true;
+                            if(AddToReturns)
-                            AddReturn(grp.OwnerID == grp.GroupID ? grp.LastOwnerID : grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return");
+                                AddReturn(grp.OwnerID == grp.GroupID ? grp.LastOwnerID : grp.OwnerID, grp.Name, grp.AbsolutePosition,
+                                        "parcel owner return");
                        }
                    }
                    else // Auto return passes through here with null agent
@@ -2242,26 +2222,24 @@ namespace OpenSim.Region.Framework.Scenes
                    }
                }
-                if (permissionToTake && (!permissionToDelete))
-                    takeGroups.Add(grp);
                if (permissionToDelete)
                {
                    if (permissionToTake)
+                        takeDeleteGroups.Add(grp);
+                    else
                        deleteGroups.Add(grp);
                    deleteIDs.Add(grp.LocalId);
                }
+                else if(permissionToTake)
+                    takeGroups.Add(grp);
            }
             SendKillObject(deleteIDs);
-            if (deleteGroups.Count > 0)
+            if (takeDeleteGroups.Count > 0)
            {
-                foreach (SceneObjectGroup g in deleteGroups)
-                    deleteIDs.Remove(g.LocalId);
                m_asyncSceneObjectDeleter.DeleteToInventory(
-                        action, destinationID, deleteGroups, remoteClient,
+                        action, destinationID, takeDeleteGroups, remoteClient,
                        true);
            }
            if (takeGroups.Count > 0)
@@ -2270,7 +2248,7 @@ namespace OpenSim.Region.Framework.Scenes
                        action, destinationID, takeGroups, remoteClient,
                        false);
            }
-            if (deleteIDs.Count > 0)
+            if (deleteGroups.Count > 0)
            {
                foreach (SceneObjectGroup g in deleteGroups)
                    DeleteSceneObject(g, true);
@@ -2658,6 +2636,7 @@ namespace OpenSim.Region.Framework.Scenes
                // We can only call this after adding the scene object, since the scene object references the scene
                // to find out if scripts should be activated at all.
+                group.AggregatePerms();
                group.CreateScriptInstances(param, true, DefaultScriptEngine, 3);
                group.ScheduleGroupForFullUpdate();
@@ -2667,7 +2646,7 @@ namespace OpenSim.Region.Framework.Scenes
        }
        public virtual bool returnObjects(SceneObjectGroup[] returnobjects,
-                UUID AgentId)
+                IClientAPI client)
        {
            List<uint> localIDs = new List<uint>();
@@ -2677,8 +2656,8 @@ namespace OpenSim.Region.Framework.Scenes
                        "parcel owner return");
                localIDs.Add(grp.RootPart.LocalId);
            }
-            DeRezObjects(null, localIDs, UUID.Zero, DeRezAction.Return,
+            DeRezObjects(client, localIDs, UUID.Zero, DeRezAction.Return,
-                    UUID.Zero);
+                    UUID.Zero, false);
            return true;
        }
@@ -2709,9 +2688,6 @@ namespace OpenSim.Region.Framework.Scenes
            {
                if (ownerID != UUID.Zero)
                    return;
-                if (!Permissions.CanDeedObject(remoteClient.AgentId, groupID))
-                    return;
            }
            List<SceneObjectGroup> groups = new List<SceneObjectGroup>();
@@ -2742,21 +2718,22 @@ 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)
+                    if (!Permissions.CanDeedObject(remoteClient, sog, groupID))
                        continue;
-                    if (!Permissions.CanTransferObject(sog.UUID, groupID))
+                    sog.SetOwnerId(groupID);
-                        continue;
-                    if (sog.GroupID != groupID)
+                    // this is wrong, GroupMask is used for group sharing, still possible to set
-                        continue;
+                    // this whould give owner rights to users that are member of group but don't have role powers to edit
+//                    sog.RootPart.GroupMask = sog.RootPart.OwnerMask;
-                    sog.SetOwnerId(groupID);
+                    // we should keep all permissions on deed to group
-                    // Make the group mask be the previous owner mask
+                    // and with this comented code, if user does not set next permissions on the object
-                    sog.RootPart.GroupMask = sog.RootPart.OwnerMask;
+                    // and on ALL contents of ALL prims, he may loose rights, making the object useless
                    sog.ApplyNextOwnerPermissions();
+                    sog.AggregatePerms();
                    sog.ScheduleGroupForFullUpdate();
@@ -2766,8 +2743,6 @@ namespace OpenSim.Region.Framework.Scenes
                        child.Inventory.ChangeInventoryOwner(groupID);
                        child.TriggerScriptChangedEvent(Changed.OWNER);
                    }
                }
            }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index e611897..4fef9c3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -183,10 +183,12 @@ namespace OpenSim.Region.Framework.Scenes
                    part.SendFullUpdate(remoteClient);
                // A prim is only tainted if it's allowed to be edited by the person clicking it.
-                if (Permissions.CanChangeSelectedState(sog.UUID, (ScenePresence)remoteClient.SceneAgent))
+                if (Permissions.CanChangeSelectedState(part, (ScenePresence)remoteClient.SceneAgent))
                {
+                    bool oldsel = part.IsSelected;
                    part.IsSelected = true;
-                    EventManager.TriggerParcelPrimCountTainted();
+                    if(!oldsel)
+                        EventManager.TriggerParcelPrimCountTainted();
                }
                part.SendPropertiesToClient(remoteClient);
@@ -228,6 +230,7 @@ namespace OpenSim.Region.Framework.Scenes
                if (so.OwnerID == remoteClient.AgentId)
                {
                    so.SetGroup(groupID, remoteClient);
+                    EventManager.TriggerParcelPrimCountTainted();
                }
            }
        }
@@ -249,7 +252,7 @@ namespace OpenSim.Region.Framework.Scenes
            // handled by group, but by prim. Legacy cruft.
            // TODO: Make selection flagging per prim!
            //
-            if (Permissions.CanChangeSelectedState(part.ParentGroup.UUID, (ScenePresence)remoteClient.SceneAgent))
+            if (Permissions.CanChangeSelectedState(part, (ScenePresence)remoteClient.SceneAgent))
            {
                part.IsSelected = false;
                if (!part.ParentGroup.IsAttachment && oldgprSelect != part.ParentGroup.IsSelected)
@@ -325,7 +328,7 @@ namespace OpenSim.Region.Framework.Scenes
            if(group == null || group.IsDeleted)
                return;
-            if (Permissions.CanMoveObject(group.UUID, remoteClient.AgentId))// && PermissionsMngr.)
+            if (Permissions.CanMoveObject(group, remoteClient))// && PermissionsMngr.)
            {
                group.GrabMovement(objectID, offset, pos, remoteClient);
            }
@@ -386,7 +389,7 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = GetGroupByPrim(objectID);
            if (group != null)
            {
-                if (Permissions.CanMoveObject(group.UUID, remoteClient.AgentId))// && PermissionsMngr.)
+                if (Permissions.CanMoveObject(group, remoteClient))// && PermissionsMngr.)
                {
                    group.SpinStart(remoteClient);
                }
@@ -404,7 +407,7 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = GetGroupByPrim(objectID);
            if (group != null)
            {
-                if (Permissions.CanMoveObject(group.UUID, remoteClient.AgentId))// && PermissionsMngr.)
+                if (Permissions.CanMoveObject(group, remoteClient))// && PermissionsMngr.)
                {
                    group.SpinMovement(rotation, remoteClient);
                }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index 8f32b03..7d69a9b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -37,52 +37,59 @@ using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Framework.Scenes
 {
    #region Delegates
-    public delegate uint GenerateClientFlagsHandler(ScenePresence sp, uint curEffectivePerms, UUID objectID);
+    public delegate uint GenerateClientFlagsHandler(SceneObjectPart part, ScenePresence sp, uint curEffectivePerms);
    public delegate void SetBypassPermissionsHandler(bool value);
    public delegate bool BypassPermissionsHandler();
    public delegate bool PropagatePermissionsHandler();
-    public delegate bool RezObjectHandler(int objectCount, UUID owner, Vector3 objectPosition, Scene scene);
+    public delegate bool RezObjectHandler(int objectCount, UUID owner, Vector3 objectPosition);
-    public delegate bool DeleteObjectHandler(UUID objectID, UUID deleter, Scene scene);
+    public delegate bool DeleteObjectHandlerByIDs(UUID objectID, UUID deleter);
-    public delegate bool TransferObjectHandler(UUID objectID, UUID recipient, Scene scene);
+    public delegate bool DeleteObjectHandler(SceneObjectGroup sog, ScenePresence sp);  
-    public delegate bool TakeObjectHandler(UUID objectID, UUID stealer, Scene scene);
+    public delegate bool TransferObjectHandler(UUID objectID, UUID recipient);
-    public delegate bool SellGroupObjectHandler(UUID userID, UUID groupID, Scene scene);
+    public delegate bool TakeObjectHandler(SceneObjectGroup sog, ScenePresence sp);
-    public delegate bool TakeCopyObjectHandler(UUID objectID, UUID userID, Scene inScene);
+    public delegate bool SellGroupObjectHandler(UUID userID, UUID groupID);
-    public delegate bool DuplicateObjectHandler(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition);
+    public delegate bool SellObjectHandlerByUserID(SceneObjectGroup sog, UUID userID, byte saleType);
-    public delegate bool EditObjectHandler(UUID objectID, UUID editorID, Scene scene);
+    public delegate bool SellObjectHandler(SceneObjectGroup sog, ScenePresence sp, byte saleType);
-    public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene);
+    public delegate bool TakeCopyObjectHandler(SceneObjectGroup sog, ScenePresence sp);
-    public delegate bool MoveObjectHandler(UUID objectID, UUID moverID, Scene scene);
+    public delegate bool DuplicateObjectHandler(SceneObjectGroup sog, ScenePresence sp);
-    public delegate bool ObjectEntryHandler(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene);
+    public delegate bool EditObjectByIDsHandler(UUID objectID, UUID editorID);
-    public delegate bool ReturnObjectsHandler(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene);
+    public delegate bool EditObjectHandler(SceneObjectGroup sog, ScenePresence sp);
-    public delegate bool InstantMessageHandler(UUID user, UUID target, Scene startScene);
+    public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID);
-    public delegate bool InventoryTransferHandler(UUID user, UUID target, Scene startScene);
+    public delegate bool MoveObjectHandler(SceneObjectGroup sog, ScenePresence sp);
-    public delegate bool ViewScriptHandler(UUID script, UUID objectID, UUID user, Scene scene);
+    public delegate bool ObjectEntryHandler(SceneObjectGroup sog, bool enteringRegion, Vector3 newPoint);
-    public delegate bool ViewNotecardHandler(UUID script, UUID objectID, UUID user, Scene scene);
+    public delegate bool ReturnObjectsHandler(ILandObject land, ScenePresence sp, List<SceneObjectGroup> objects);
-    public delegate bool EditScriptHandler(UUID script, UUID objectID, UUID user, Scene scene);
+    public delegate bool InstantMessageHandler(UUID user, UUID target);
-    public delegate bool EditNotecardHandler(UUID notecard, UUID objectID, UUID user, Scene scene);
+    public delegate bool InventoryTransferHandler(UUID user, UUID target);
-    public delegate bool RunScriptHandler(UUID script, UUID objectID, UUID user, Scene scene);
+    public delegate bool ViewScriptHandler(UUID script, UUID objectID, UUID user);
-    public delegate bool CompileScriptHandler(UUID ownerUUID, int scriptType, Scene scene);
+    public delegate bool ViewNotecardHandler(UUID script, UUID objectID, UUID user);
-    public delegate bool StartScriptHandler(UUID script, UUID user, Scene scene);
+    public delegate bool EditScriptHandler(UUID script, UUID objectID, UUID user);
-    public delegate bool StopScriptHandler(UUID script, UUID user, Scene scene);
+    public delegate bool EditNotecardHandler(UUID notecard, UUID objectID, UUID user);
-    public delegate bool ResetScriptHandler(UUID prim, UUID script, UUID user, Scene scene);
+    public delegate bool RunScriptHandlerByIDs(UUID script, UUID objectID, UUID user);
-    public delegate bool TerraformLandHandler(UUID user, Vector3 position, Scene requestFromScene);
+    public delegate bool RunScriptHandler(TaskInventoryItem item, SceneObjectPart part);
-    public delegate bool RunConsoleCommandHandler(UUID user, Scene requestFromScene);
+    public delegate bool CompileScriptHandler(UUID ownerUUID, int scriptType);
-    public delegate bool IssueEstateCommandHandler(UUID user, Scene requestFromScene, bool ownerCommand);
+    public delegate bool StartScriptHandler(UUID script, UUID user);
-    public delegate bool IsGodHandler(UUID user, Scene requestFromScene);
+    public delegate bool StopScriptHandler(UUID script, UUID user);
-    public delegate bool IsGridGodHandler(UUID user, Scene requestFromScene);
+    public delegate bool ResetScriptHandler(UUID prim, UUID script, UUID user);
+    public delegate bool TerraformLandHandler(UUID user, Vector3 position);
+    public delegate bool RunConsoleCommandHandler(UUID user);
+    public delegate bool IssueEstateCommandHandler(UUID user, bool ownerCommand);
+    public delegate bool IsGodHandler(UUID user);
+    public delegate bool IsGridGodHandler(UUID user);
    public delegate bool IsAdministratorHandler(UUID user);
    public delegate bool IsEstateManagerHandler(UUID user);
-    public delegate bool EditParcelHandler(UUID user, ILandObject parcel, Scene scene);
+    public delegate bool EditParcelHandler(UUID user, ILandObject parcel);
-    public delegate bool EditParcelPropertiesHandler(UUID user, ILandObject parcel, GroupPowers p, Scene scene, bool allowManager);
+    public delegate bool EditParcelPropertiesHandler(UUID user, ILandObject parcel, GroupPowers p, bool allowManager);
-    public delegate bool SellParcelHandler(UUID user, ILandObject parcel, Scene scene);
+    public delegate bool SellParcelHandler(UUID user, ILandObject parcel);
-    public delegate bool AbandonParcelHandler(UUID user, ILandObject parcel, Scene scene);
+    public delegate bool AbandonParcelHandler(UUID user, ILandObject parcel);
-    public delegate bool ReclaimParcelHandler(UUID user, ILandObject parcel, Scene scene);
+    public delegate bool ReclaimParcelHandler(UUID user, ILandObject parcel);
-    public delegate bool DeedParcelHandler(UUID user, ILandObject parcel, Scene scene);
+    public delegate bool DeedParcelHandler(UUID user, ILandObject parcel);
-    public delegate bool DeedObjectHandler(UUID user, UUID group, Scene scene);
+    public delegate bool DeedObjectHandler(ScenePresence sp, SceneObjectGroup sog, UUID targetGroupID);
-    public delegate bool BuyLandHandler(UUID user, ILandObject parcel, Scene scene);
+    public delegate bool BuyLandHandler(UUID user, ILandObject parcel);
    public delegate bool LinkObjectHandler(UUID user, UUID objectID);
    public delegate bool DelinkObjectHandler(UUID user, UUID objectID);
    public delegate bool CreateObjectInventoryHandler(int invType, UUID objectID, UUID userID);
    public delegate bool CopyObjectInventoryHandler(UUID itemID, UUID objectID, UUID userID);
+    public delegate bool DoObjectInvToObjectInv(TaskInventoryItem item, SceneObjectPart sourcePart, SceneObjectPart destPart);
+    public delegate bool DoDropInObjectInv(InventoryItemBase item, ScenePresence sp, SceneObjectPart destPart);
    public delegate bool DeleteObjectInventoryHandler(UUID itemID, UUID objectID, UUID userID);
    public delegate bool TransferObjectInventoryHandler(UUID itemID, UUID objectID, UUID userID);
    public delegate bool CreateUserInventoryHandler(int invType, UUID userID);
@@ -112,12 +119,18 @@ namespace OpenSim.Region.Framework.Scenes
        public event BypassPermissionsHandler OnBypassPermissions;
        public event PropagatePermissionsHandler OnPropagatePermissions;
        public event RezObjectHandler OnRezObject;
+        public event DeleteObjectHandlerByIDs OnDeleteObjectByIDs;
        public event DeleteObjectHandler OnDeleteObject;
        public event TransferObjectHandler OnTransferObject;
        public event TakeObjectHandler OnTakeObject;
        public event SellGroupObjectHandler OnSellGroupObject;
+        public event SellObjectHandlerByUserID OnSellObjectByUserID;
+        public event SellObjectHandler OnSellObject;
        public event TakeCopyObjectHandler OnTakeCopyObject;
        public event DuplicateObjectHandler OnDuplicateObject;
+        public event EditObjectByIDsHandler OnEditObjectByIDs;
        public event EditObjectHandler OnEditObject;
        public event EditObjectInventoryHandler OnEditObjectInventory;
        public event MoveObjectHandler OnMoveObject;
@@ -129,6 +142,7 @@ namespace OpenSim.Region.Framework.Scenes
        public event ViewNotecardHandler OnViewNotecard;
        public event EditScriptHandler OnEditScript;
        public event EditNotecardHandler OnEditNotecard;
+        public event RunScriptHandlerByIDs OnRunScriptByIDs;
        public event RunScriptHandler OnRunScript;
        public event CompileScriptHandler OnCompileScript;
        public event StartScriptHandler OnStartScript;
@@ -137,7 +151,6 @@ namespace OpenSim.Region.Framework.Scenes
        public event TerraformLandHandler OnTerraformLand;
        public event RunConsoleCommandHandler OnRunConsoleCommand;
        public event IssueEstateCommandHandler OnIssueEstateCommand;
-        public event IsGodHandler OnIsGod;
        public event IsGridGodHandler OnIsGridGod;
        public event IsAdministratorHandler OnIsAdministrator;
        public event IsEstateManagerHandler OnIsEstateManager;
@@ -153,6 +166,8 @@ namespace OpenSim.Region.Framework.Scenes
        public event DelinkObjectHandler OnDelinkObject;
        public event CreateObjectInventoryHandler OnCreateObjectInventory;
        public event CopyObjectInventoryHandler OnCopyObjectInventory;
+        public event DoObjectInvToObjectInv OnDoObjectInvToObjectInv;
+        public event DoDropInObjectInv OnDropInObjectInv;
        public event DeleteObjectInventoryHandler OnDeleteObjectInventory;
        public event TransferObjectInventoryHandler OnTransferObjectInventory;
        public event CreateUserInventoryHandler OnCreateUserInventory;
@@ -167,7 +182,7 @@ namespace OpenSim.Region.Framework.Scenes
        #region Object Permission Checks
-        public uint GenerateClientFlags(ScenePresence sp, UUID objectID)
+        public uint GenerateClientFlags( SceneObjectPart part, ScenePresence sp)
        {
            // libomv will moan about PrimFlags.ObjectYouOfficer being
            // obsolete...
@@ -182,8 +197,6 @@ namespace OpenSim.Region.Framework.Scenes
                PrimFlags.ObjectOwnerModify;
 #pragma warning restore 0612
-            SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
            if (part == null)
                return 0;
@@ -195,7 +208,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handlerGenerateClientFlags.GetInvocationList();
                foreach (GenerateClientFlagsHandler check in list)
                {
-                    perms &= check(sp, perms, objectID);
+                    perms &= check(part, sp, perms);
                }
            }
            return perms;
@@ -247,7 +260,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (RezObjectHandler h in list)
                {
-                    if (h(objectCount, owner,objectPosition, m_scene) == false)
+                    if (h(objectCount, owner,objectPosition) == false)
                        return false;
                }
            }
@@ -261,141 +274,183 @@ namespace OpenSim.Region.Framework.Scenes
        {
            bool result = true;
-            DeleteObjectHandler handler = OnDeleteObject;
+            DeleteObjectHandlerByIDs handler = OnDeleteObjectByIDs;
            if (handler != null)
            {
                Delegate[] list = handler.GetInvocationList();
-                foreach (DeleteObjectHandler h in list)
+                foreach (DeleteObjectHandlerByIDs h in list)
                {
-                    if (h(objectID, deleter, m_scene) == false)
+                    if (h(objectID, deleter) == false)
                    {
                        result = false;
                        break;
                    }
                }
            }
            return result;
        }
-        public bool CanTransferObject(UUID objectID, UUID recipient)
+        public bool CanDeleteObject(SceneObjectGroup sog, IClientAPI client)
        {
-            bool result = true;
+            DeleteObjectHandler handler = OnDeleteObject;
+            if (handler != null)
+            {
+               if(sog == null || client == null || client.SceneAgent == null)
+                    return false;
+                ScenePresence sp = client.SceneAgent as ScenePresence;
+                Delegate[] list = handler.GetInvocationList();
+                foreach (DeleteObjectHandler h in list)
+                {
+                    if (h(sog, sp) == false)
+                        return false;
+                }
+            }
+            return true;
+        }
+        public bool CanTransferObject(UUID objectID, UUID recipient)
+        {
            TransferObjectHandler handler = OnTransferObject;
            if (handler != null)
            {
                Delegate[] list = handler.GetInvocationList();
                foreach (TransferObjectHandler h in list)
                {
-                    if (h(objectID, recipient, m_scene) == false)
+                    if (h(objectID, recipient) == false)
-                    {
+                        return false;
-                        result = false;
-                        break;
-                    }
                }
            }
+            return true;
-            return result;
        }
        #endregion
        #region TAKE OBJECT
-        public bool CanTakeObject(UUID objectID, UUID AvatarTakingUUID)
+        public bool CanTakeObject(SceneObjectGroup sog, ScenePresence sp)
        {
-            bool result = true;
            TakeObjectHandler handler = OnTakeObject;
            if (handler != null)
            {
+                if(sog == null || sp == null)
+                    return false;
                Delegate[] list = handler.GetInvocationList();
                foreach (TakeObjectHandler h in list)
                {
-                    if (h(objectID, AvatarTakingUUID, m_scene) == false)
+                    if (h(sog, sp) == false)
-                    {
+                        return false;
-                        result = false;
-                        break;
-                    }
                }
            }
 //            m_log.DebugFormat(
 //                "[SCENE PERMISSIONS]: CanTakeObject() fired for object {0}, taker {1}, result {2}",
 //                objectID, AvatarTakingUUID, result);
+            return true;
-            return result;
        }
        #endregion
        #region SELL GROUP OBJECT
-        public bool CanSellGroupObject(UUID userID, UUID groupID, Scene scene)
+        public bool CanSellGroupObject(UUID userID, UUID groupID)
        {
-            bool result = true;
            SellGroupObjectHandler handler = OnSellGroupObject;
            if (handler != null)
            {
                Delegate[] list = handler.GetInvocationList();
                foreach (SellGroupObjectHandler h in list)
                {
-                    if (h(userID, groupID, scene) == false)
+                    if (h(userID, groupID) == false)
-                    {
+                        return false;
-                        result = false;
-                        break;
-                    }
                }
            }
            //m_log.DebugFormat(
            //    "[SCENE PERMISSIONS]: CanSellGroupObject() fired for user {0}, group {1}, result {2}",
            //    userID, groupID, result);
+            return true;
+        }
-            return result;
+        #endregion
+        #region SELL OBJECT
+        public bool CanSellObject(IClientAPI client, SceneObjectGroup sog, byte saleType)
+        {
+            SellObjectHandler handler = OnSellObject;
+            if (handler != null)
+            {
+                if(sog == null || client == null || client.SceneAgent == null)
+                    return false;
+                ScenePresence sp = client.SceneAgent as ScenePresence;
+                Delegate[] list = handler.GetInvocationList();
+                foreach (SellObjectHandler h in list)
+                {
+                    if (h(sog, sp, saleType) == false)
+                        return false;
+                }
+            }
+            return true;
+        }
+        public bool CanSellObject(UUID userID, SceneObjectGroup sog, byte saleType)
+        {
+            SellObjectHandlerByUserID handler = OnSellObjectByUserID;
+            if (handler != null)
+            {
+                if(sog == null)
+                    return false;
+                Delegate[] list = handler.GetInvocationList();
+                foreach (SellObjectHandlerByUserID h in list)
+                {
+                    if (h(sog, userID, saleType) == false)
+                        return false;
+                }
+            }
+            return true;
        }
        #endregion
        #region TAKE COPY OBJECT
-        public bool CanTakeCopyObject(UUID objectID, UUID userID)
+        public bool CanTakeCopyObject(SceneObjectGroup sog, ScenePresence sp)
        {
-            bool result = true;
            TakeCopyObjectHandler handler = OnTakeCopyObject;
            if (handler != null)
            {
+                if(sog == null || sp == null)
+                    return false;
                Delegate[] list = handler.GetInvocationList();
                foreach (TakeCopyObjectHandler h in list)
                {
-                    if (h(objectID, userID, m_scene) == false)
+                    if (h(sog, sp) == false)
-                    {
+                        return false;
-                        result = false;
-                        break;
-                    }
                }
            }
 //            m_log.DebugFormat(
 //                "[SCENE PERMISSIONS]: CanTakeCopyObject() fired for object {0}, user {1}, result {2}",
 //                objectID, userID, result);
+            return true;
-            return result;
        }
        #endregion
        #region DUPLICATE OBJECT
-        public bool CanDuplicateObject(int objectCount, UUID objectID, UUID owner, Vector3 objectPosition)
+        public bool CanDuplicateObject(SceneObjectGroup sog, UUID agentID)
        {
            DuplicateObjectHandler handler = OnDuplicateObject;
            if (handler != null)
            {
+                if(sog == null || sog.IsDeleted)
+                    return false;
+                ScenePresence sp = m_scene.GetScenePresence(agentID);
+                if(sp == null || sp.IsDeleted)
+                    return false;
                Delegate[] list = handler.GetInvocationList();
                foreach (DuplicateObjectHandler h in list)
                {
-                    if (h(objectCount, objectID, owner, m_scene, objectPosition) == false)
+                    if (h(sog, sp) == false)
                        return false;
                }
            }
@@ -411,9 +466,9 @@ namespace OpenSim.Region.Framework.Scenes
            PrimFlags.ObjectOwnerModify
            );
-        public bool CanChangeSelectedState(UUID objectID, ScenePresence sp)
+        public bool CanChangeSelectedState(SceneObjectPart part, ScenePresence sp)
        {
-            uint perms = GenerateClientFlags(sp , objectID);
+            uint perms = GenerateClientFlags(part, sp);
            return (perms & CANSELECTMASK) != 0;
        }
@@ -421,13 +476,33 @@ namespace OpenSim.Region.Framework.Scenes
        #region EDIT OBJECT
        public bool CanEditObject(UUID objectID, UUID editorID)
        {
+            EditObjectByIDsHandler handler = OnEditObjectByIDs;
+            if (handler != null)
+            {
+                Delegate[] list = handler.GetInvocationList();
+                foreach (EditObjectByIDsHandler h in list)
+                {
+                    if (h(objectID, editorID) == false)
+                        return false;
+                }
+            }
+            return true;
+        }
+        public bool CanEditObject(SceneObjectGroup sog, IClientAPI client)
+        {
            EditObjectHandler handler = OnEditObject;
            if (handler != null)
            {
+                if(sog == null || client == null || client.SceneAgent == null)
+                    return false;
+                ScenePresence sp = client.SceneAgent as ScenePresence;
                Delegate[] list = handler.GetInvocationList();
                foreach (EditObjectHandler h in list)
                {
-                    if (h(objectID, editorID, m_scene) == false)
+                    if (h(sog, sp) == false)
                        return false;
                }
            }
@@ -442,7 +517,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (EditObjectInventoryHandler h in list)
                {
-                    if (h(objectID, editorID, m_scene) == false)
+                    if (h(objectID, editorID) == false)
                        return false;
                }
            }
@@ -452,15 +527,20 @@ namespace OpenSim.Region.Framework.Scenes
        #endregion
        #region MOVE OBJECT
-        public bool CanMoveObject(UUID objectID, UUID moverID)
+        public bool CanMoveObject(SceneObjectGroup sog, IClientAPI client)
        {
            MoveObjectHandler handler = OnMoveObject;
            if (handler != null)
            {
+                if(sog == null || client == null || client.SceneAgent == null)
+                    return false;
+                ScenePresence sp = client.SceneAgent as ScenePresence;
                Delegate[] list = handler.GetInvocationList();
                foreach (MoveObjectHandler h in list)
                {
-                    if (h(objectID, moverID, m_scene) == false)
+                    if (h(sog, sp) == false)
                        return false;
                }
            }
@@ -470,7 +550,7 @@ namespace OpenSim.Region.Framework.Scenes
        #endregion
        #region OBJECT ENTRY
-        public bool CanObjectEntry(UUID objectID, bool enteringRegion, Vector3 newPoint)
+        public bool CanObjectEntry(SceneObjectGroup sog, bool enteringRegion, Vector3 newPoint)
        {
            ObjectEntryHandler handler = OnObjectEntry;
            if (handler != null)
@@ -478,7 +558,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (ObjectEntryHandler h in list)
                {
-                    if (h(objectID, enteringRegion, newPoint, m_scene) == false)
+                    if (h(sog, enteringRegion, newPoint) == false)
                        return false;
                }
            }
@@ -488,29 +568,30 @@ namespace OpenSim.Region.Framework.Scenes
        #endregion
        #region RETURN OBJECT
-        public bool CanReturnObjects(ILandObject land, UUID user, List<SceneObjectGroup> objects)
+        public bool CanReturnObjects(ILandObject land, IClientAPI client, List<SceneObjectGroup> objects)
        {
-            bool result = true;
            ReturnObjectsHandler handler = OnReturnObjects;
            if (handler != null)
            {
+                if(objects == null)
+                    return false;
+                
+                ScenePresence sp = null;
+                if(client != null && client.SceneAgent != null)
+                    sp = client.SceneAgent as ScenePresence;
                Delegate[] list = handler.GetInvocationList();
                foreach (ReturnObjectsHandler h in list)
                {
-                    if (h(land, user, objects, m_scene) == false)
+                    if (h(land, sp, objects) == false)
-                    {
+                        return false;
-                        result = false;
-                        break;
-                    }
                }
            }
 //            m_log.DebugFormat(
 //                "[SCENE PERMISSIONS]: CanReturnObjects() fired for user {0} for {1} objects on {2}, result {3}",
 //                user, objects.Count, land.LandData.Name, result);
-            return result;
+            return true;
        }
        #endregion
@@ -524,7 +605,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (InstantMessageHandler h in list)
                {
-                    if (h(user, target, m_scene) == false)
+                    if (h(user, target) == false)
                        return false;
                }
            }
@@ -542,7 +623,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (InventoryTransferHandler h in list)
                {
-                    if (h(user, target, m_scene) == false)
+                    if (h(user, target) == false)
                        return false;
                }
            }
@@ -560,7 +641,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (ViewScriptHandler h in list)
                {
-                    if (h(script, objectID, user, m_scene) == false)
+                    if (h(script, objectID, user) == false)
                        return false;
                }
            }
@@ -575,7 +656,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (ViewNotecardHandler h in list)
                {
-                    if (h(script, objectID, user, m_scene) == false)
+                    if (h(script, objectID, user) == false)
                        return false;
                }
            }
@@ -593,7 +674,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (EditScriptHandler h in list)
                {
-                    if (h(script, objectID, user, m_scene) == false)
+                    if (h(script, objectID, user) == false)
                        return false;
                }
            }
@@ -608,7 +689,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (EditNotecardHandler h in list)
                {
-                    if (h(script, objectID, user, m_scene) == false)
+                    if (h(script, objectID, user) == false)
                        return false;
                }
            }
@@ -620,19 +701,37 @@ namespace OpenSim.Region.Framework.Scenes
        #region RUN SCRIPT (When Script Placed in Object)
        public bool CanRunScript(UUID script, UUID objectID, UUID user)
        {
+            RunScriptHandlerByIDs handler = OnRunScriptByIDs;
+            if (handler != null)
+            {
+                Delegate[] list = handler.GetInvocationList();
+                foreach (RunScriptHandlerByIDs h in list)
+                {
+                    if (h(script, objectID, user) == false)
+                        return false;
+                }
+            }
+            return true;
+        }
+        public bool CanRunScript(TaskInventoryItem item, SceneObjectPart part)
+        {
            RunScriptHandler handler = OnRunScript;
            if (handler != null)
            {
+                if(item == null || part == null)
+                    return false;
                Delegate[] list = handler.GetInvocationList();
                foreach (RunScriptHandler h in list)
                {
-                    if (h(script, objectID, user, m_scene) == false)
+                    if (h(item, part) == false)
                        return false;
                }
            }
            return true;
        }
        #endregion
        #region COMPILE SCRIPT (When Script needs to get (re)compiled)
@@ -644,7 +743,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (CompileScriptHandler h in list)
                {
-                    if (h(ownerUUID, scriptType, m_scene) == false)
+                    if (h(ownerUUID, scriptType) == false)
                        return false;
                }
            }
@@ -662,7 +761,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (StartScriptHandler h in list)
                {
-                    if (h(script, user, m_scene) == false)
+                    if (h(script, user) == false)
                        return false;
                }
            }
@@ -680,7 +779,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (StopScriptHandler h in list)
                {
-                    if (h(script, user, m_scene) == false)
+                    if (h(script, user) == false)
                        return false;
                }
            }
@@ -698,7 +797,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (ResetScriptHandler h in list)
                {
-                    if (h(prim, script, user, m_scene) == false)
+                    if (h(prim, script, user) == false)
                        return false;
                }
            }
@@ -716,7 +815,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (TerraformLandHandler h in list)
                {
-                    if (h(user, pos, m_scene) == false)
+                    if (h(user, pos) == false)
                        return false;
                }
            }
@@ -734,7 +833,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (RunConsoleCommandHandler h in list)
                {
-                    if (h(user, m_scene) == false)
+                    if (h(user) == false)
                        return false;
                }
            }
@@ -752,7 +851,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (IssueEstateCommandHandler h in list)
                {
-                    if (h(user, m_scene, ownerCommand) == false)
+                    if (h(user, ownerCommand) == false)
                        return false;
                }
            }
@@ -763,13 +862,13 @@ namespace OpenSim.Region.Framework.Scenes
        #region CAN BE GODLIKE
        public bool IsGod(UUID user)
        {
-            IsGodHandler handler = OnIsGod;
+            IsAdministratorHandler handler = OnIsAdministrator;
            if (handler != null)
            {
                Delegate[] list = handler.GetInvocationList();
-                foreach (IsGodHandler h in list)
+                foreach (IsAdministratorHandler h in list)
                {
-                    if (h(user, m_scene) == false)
+                    if (h(user) == false)
                        return false;
                }
            }
@@ -784,7 +883,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (IsGridGodHandler h in list)
                {
-                    if (h(user, m_scene) == false)
+                    if (h(user) == false)
                        return false;
                }
            }
@@ -832,7 +931,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (EditParcelPropertiesHandler h in list)
                {
-                    if (h(user, parcel, p, m_scene, allowManager) == false)
+                    if (h(user, parcel, p, allowManager) == false)
                        return false;
                }
            }
@@ -849,7 +948,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (SellParcelHandler h in list)
                {
-                    if (h(user, parcel, m_scene) == false)
+                    if (h(user, parcel) == false)
                        return false;
                }
            }
@@ -866,7 +965,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (AbandonParcelHandler h in list)
                {
-                    if (h(user, parcel, m_scene) == false)
+                    if (h(user, parcel) == false)
                        return false;
                }
            }
@@ -882,7 +981,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (ReclaimParcelHandler h in list)
                {
-                    if (h(user, parcel, m_scene) == false)
+                    if (h(user, parcel) == false)
                        return false;
                }
            }
@@ -897,22 +996,27 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (DeedParcelHandler h in list)
                {
-                    if (h(user, parcel, m_scene) == false)
+                    if (h(user, parcel) == false)
                        return false;
                }
            }
            return true;
        }
-        public bool CanDeedObject(UUID user, UUID group)
+        public bool CanDeedObject(IClientAPI client, SceneObjectGroup sog, UUID targetGroupID)
        {
            DeedObjectHandler handler = OnDeedObject;
            if (handler != null)
            {
+               if(sog == null || client == null || client.SceneAgent == null || targetGroupID == UUID.Zero)
+                    return false;
+                ScenePresence sp = client.SceneAgent as ScenePresence;
                Delegate[] list = handler.GetInvocationList();
                foreach (DeedObjectHandler h in list)
                {
-                    if (h(user, group, m_scene) == false)
+                    if (h(sp, sog, targetGroupID) == false)
                        return false;
                }
            }
@@ -927,7 +1031,7 @@ namespace OpenSim.Region.Framework.Scenes
                Delegate[] list = handler.GetInvocationList();
                foreach (BuyLandHandler h in list)
                {
-                    if (h(user, parcel, m_scene) == false)
+                    if (h(user, parcel) == false)
                        return false;
                }
            }
@@ -1003,6 +1107,45 @@ namespace OpenSim.Region.Framework.Scenes
            return true;
        }
+        public bool CanDoObjectInvToObjectInv(TaskInventoryItem item, SceneObjectPart sourcePart, SceneObjectPart destPart)
+        {
+            DoObjectInvToObjectInv handler = OnDoObjectInvToObjectInv;
+            if (handler != null)
+            {
+                if (sourcePart == null || destPart == null || item == null)
+                    return false;
+                Delegate[] list = handler.GetInvocationList();
+                foreach (DoObjectInvToObjectInv h in list)
+                {
+                    if (h(item, sourcePart, destPart) == false)
+                        return false;
+                }
+            }
+            return true;
+        }
+        public bool CanDropInObjectInv(InventoryItemBase item, IClientAPI client, SceneObjectPart destPart)
+        {
+            DoDropInObjectInv handler = OnDropInObjectInv;
+            if (handler != null)
+            {
+                if (client == null || client.SceneAgent == null|| destPart == null || item == null)
+                    return false;
+                ScenePresence sp = client.SceneAgent as ScenePresence;
+                if(sp == null || sp.IsDeleted)
+                    return false;
+                Delegate[] list = handler.GetInvocationList();
+                foreach (DoDropInObjectInv h in list)
+                {
+                    if (h(item, sp, destPart) == false)
+                        return false;
+                }
+            }
+            return true;
+        }
        public bool CanDeleteObjectInventory(UUID itemID, UUID objectID, UUID userID)
        {
            DeleteObjectInventoryHandler handler = OnDeleteObjectInventory;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index fd13821..c5b082c 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2388,6 +2388,7 @@ namespace OpenSim.Region.Framework.Scenes
                EventManager.TriggerOnSceneObjectLoaded(group);
                SceneObjectPart rootPart = group.GetPart(group.UUID);
                rootPart.Flags &= ~PrimFlags.Scripted;
+                group.AggregateDeepPerms();
                rootPart.TrimPermissions();
                // Don't do this here - it will get done later on when sculpt data is loaded.
@@ -2640,8 +2641,8 @@ namespace OpenSim.Region.Framework.Scenes
            {
                // Otherwise, use this default creation code;
                sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape);
-                AddNewSceneObject(sceneObject, true);
                sceneObject.SetGroup(groupID, null);
+                AddNewSceneObject(sceneObject, true);
                if (AgentPreferencesService != null) // This will override the brave new full perm world!
                {
@@ -2659,6 +2660,7 @@ namespace OpenSim.Region.Framework.Scenes
            if (UserManagementModule != null)
                sceneObject.RootPart.CreatorIdentification = UserManagementModule.GetUserUUI(ownerID);
+            sceneObject.AggregateDeepPerms();
            sceneObject.ScheduleGroupForFullUpdate();
            return sceneObject;
@@ -2805,7 +2807,7 @@ namespace OpenSim.Region.Framework.Scenes
                        SceneObjectGroup sog = (SceneObjectGroup)e;
                        if (sog != null && !sog.IsAttachment)
                        {
-                            if (!exceptNoCopy || ((sog.GetEffectivePermissions() & (uint)PermissionMask.Copy) != 0))
+                            if (!exceptNoCopy || ((sog.EffectiveOwnerPerms & (uint)PermissionMask.Copy) != 0))
                            {
                                DeleteSceneObject((SceneObjectGroup)e, false);
                            }
@@ -2819,7 +2821,7 @@ namespace OpenSim.Region.Framework.Scenes
            }
            if (toReturn.Count > 0)
            {
-                returnObjects(toReturn.ToArray(), UUID.Zero);
+                returnObjects(toReturn.ToArray(), null);
            }
        }
@@ -3640,7 +3642,9 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="GroupID">Group of new object</param>
        public void DuplicateObject(uint originalPrim, Vector3 offset, uint flags, UUID AgentID, UUID GroupID)
        {
-            SceneObjectGroup copy = SceneGraph.DuplicateObject(originalPrim, offset, flags, AgentID, GroupID, Quaternion.Identity);
+            bool createSelected = (flags & (uint)PrimFlags.CreateSelected) != 0;
+            SceneObjectGroup copy = SceneGraph.DuplicateObject(originalPrim, offset, AgentID,
+                    GroupID, Quaternion.Identity, createSelected);
            if (copy != null)
                EventManager.TriggerObjectAddedToScene(copy);
        }
@@ -3670,6 +3674,8 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectPart target = GetSceneObjectPart(localID);
            SceneObjectPart target2 = GetSceneObjectPart(RayTargetObj);
+            bool createSelected = (dupeFlags & (uint)PrimFlags.CreateSelected) != 0;
            if (target != null && target2 != null)
            {
                Vector3 direction = Vector3.Normalize(RayEnd - RayStart);
@@ -3711,13 +3717,13 @@ namespace OpenSim.Region.Framework.Scenes
                        Quaternion worldRot = target2.GetWorldRotation();
                        // SceneObjectGroup obj = m_sceneGraph.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, worldRot);
-                        copy = m_sceneGraph.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, worldRot);
+                        copy = m_sceneGraph.DuplicateObject(localID, pos, AgentID, GroupID, worldRot, createSelected);
                        //obj.Rotation = worldRot;
                        //obj.UpdateGroupRotationR(worldRot);
                    }
                    else
                    {
-                        copy = m_sceneGraph.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, Quaternion.Identity);
+                        copy = m_sceneGraph.DuplicateObject(localID, pos, AgentID, GroupID, Quaternion.Identity, createSelected);
                    }
                    if (copy != null)
@@ -5114,65 +5120,59 @@ Label_GroupsDone:
        #endregion
        #region Script Engine
+        public bool LSLScriptDanger(SceneObjectPart part, Vector3 pos)
-        private bool ScriptDanger(SceneObjectPart part, Vector3 pos)
        {
            ILandObject parcel = LandChannel.GetLandObject(pos.X, pos.Y);
-            if (part != null)
+            if (parcel == null)
-            {
+                return true;
-                if (parcel != null)
+            
-                {
+            LandData ldata = parcel.LandData;
-                    if ((parcel.LandData.Flags & (uint)ParcelFlags.AllowOtherScripts) != 0)
+            if (ldata == null)
-                    {
+                return true;
-                        return true;
+     
-                    }
+            uint landflags = ldata.Flags;
-                    else if ((part.OwnerID == parcel.LandData.OwnerID) || Permissions.IsGod(part.OwnerID))
+        
-                    {
+            uint mask = (uint)(ParcelFlags.CreateObjects | ParcelFlags.AllowAPrimitiveEntry);
-                        return true;
+            if((landflags & mask) != mask)
-                    }
+                return true;
-                    else if (((parcel.LandData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0)
+ 
-                        && (parcel.LandData.GroupID != UUID.Zero) && (parcel.LandData.GroupID == part.GroupID))
+            if((landflags & (uint)ParcelFlags.AllowOtherScripts) != 0)
-                    {
+                return false;
-                        return true;
-                    }
-                    else
-                    {
-                        return false;
-                    }
-                }
-                else
-                {
-                    if (pos.X > 0f && pos.X < RegionInfo.RegionSizeX && pos.Y > 0f && pos.Y < RegionInfo.RegionSizeY)
+            if(part == null)
-                    {
+                return true;
-                        // The only time parcel != null when an object is inside a region is when
+            if(part.GroupID == ldata.GroupID && (landflags & (uint)ParcelFlags.AllowGroupScripts) != 0)
-                        // there is nothing behind the landchannel.  IE, no land plugin loaded.
-                        return true;
-                    }
-                    else
-                    {
-                        // The object is outside of this region.  Stop piping events to it.
-                        return false;
-                    }
-                }
-            }
-            else
-            {
                return false;
-            }
+            return true;
        }
-        public bool ScriptDanger(uint localID, Vector3 pos)
+        private bool ScriptDanger(SceneObjectPart part, Vector3 pos)
        {
-            SceneObjectPart part = GetSceneObjectPart(localID);
+            if (part == null)
-            if (part != null)
+                return false;
+            ILandObject parcel = LandChannel.GetLandObject(pos.X, pos.Y);
+            if (parcel != null)
            {
-                return ScriptDanger(part, pos);
+                if ((parcel.LandData.Flags & (uint)ParcelFlags.AllowOtherScripts) != 0)
+                    return true;
+                if ((part.OwnerID == parcel.LandData.OwnerID) || Permissions.IsGod(part.OwnerID))
+                    return true;
+                if (((parcel.LandData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0)
+                    && (parcel.LandData.GroupID != UUID.Zero) && (parcel.LandData.GroupID == part.GroupID))
+                    return true;
            }
            else
            {
-                return false;
+                if (pos.X > 0f && pos.X < RegionInfo.RegionSizeX && pos.Y > 0f && pos.Y < RegionInfo.RegionSizeY)
+                    return true;
            }
+            return false;
        }
        public bool PipeEventsForScript(uint localID)
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 2f65ce2..49e98e7 100755
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -343,7 +343,7 @@ namespace OpenSim.Region.Framework.Scenes
                sceneObject.ForceInventoryPersistence();
                sceneObject.HasGroupChanged = true;
            }
+            sceneObject.AggregateDeepPerms();
            return ret;
        }
@@ -1358,7 +1358,7 @@ namespace OpenSim.Region.Framework.Scenes
                SceneObjectGroup grp = part.ParentGroup;
                if (grp != null)
                {
-                    if (m_parentScene.Permissions.CanEditObject(grp.UUID, remoteClient.AgentId))
+                    if (m_parentScene.Permissions.CanEditObject(grp, remoteClient))
                    {
                        // These two are exceptions SL makes in the interpretation
                        // of the change flags. Must check them here because otherwise
@@ -1379,7 +1379,7 @@ namespace OpenSim.Region.Framework.Scenes
                            if ((data.change & (ObjectChangeType.Position | ObjectChangeType.Rotation)) != 0)
                            {
                                // Are we allowed to move it?
-                                if (m_parentScene.Permissions.CanMoveObject(grp.UUID, remoteClient.AgentId))
+                                if (m_parentScene.Permissions.CanMoveObject(grp, remoteClient))
                                {
                                    // Strip all but move and rotation from request
                                    data.change &= (ObjectChangeType.Group | ObjectChangeType.Position | ObjectChangeType.Rotation);
@@ -1406,7 +1406,7 @@ namespace OpenSim.Region.Framework.Scenes
            if (part != null)
            {
-                if (m_parentScene.Permissions.CanEditObject(part.ParentGroup.UUID, remoteClient.AgentId))
+                if (m_parentScene.Permissions.CanEditObject(part.ParentGroup, remoteClient))
                {
                    bool physbuild = false;
                    if (part.ParentGroup.RootPart.PhysActor != null)
@@ -1428,7 +1428,7 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = GetGroupByPrim(localID);
            if (group != null)
            {
-                if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId))
+                if (m_parentScene.Permissions.CanEditObject(group, remoteClient))
                {
                    bool physbuild = false;
                    if (group.RootPart.PhysActor != null)
@@ -1474,7 +1474,7 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = GetGroupByPrim(localID);
            if (group != null)
            {
-                if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId))
+                if (m_parentScene.Permissions.CanMoveObject(group, remoteClient))
                {
                    group.UpdateSingleRotation(rot, localID);
                }
@@ -1492,7 +1492,7 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = GetGroupByPrim(localID);
            if (group != null)
            {
-                if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId))
+                if (m_parentScene.Permissions.CanMoveObject(group, remoteClient))
                {
                    group.UpdateSingleRotation(rot, pos, localID);
                }
@@ -1510,7 +1510,7 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = GetGroupByPrim(localID);
            if (group != null)
            {
-                if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId))
+                if (m_parentScene.Permissions.CanMoveObject(group, remoteClient))
                {
                    group.UpdateGroupRotationR(rot);
                }
@@ -1529,7 +1529,7 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = GetGroupByPrim(localID);
            if (group != null)
            {
-                if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId))
+                if (m_parentScene.Permissions.CanMoveObject(group, remoteClient))
                {
                    group.UpdateGroupRotationPR(pos, rot);
                }
@@ -1547,7 +1547,7 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = GetGroupByPrim(localID);
            if (group != null)
            {
-                if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId) || group.IsAttachment)
+                if (m_parentScene.Permissions.CanMoveObject(group, remoteClient) || group.IsAttachment)
                {
                    group.UpdateSinglePosition(pos, localID);
                }
@@ -1562,17 +1562,6 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="remoteClient"></param>
        public void UpdatePrimGroupPosition(uint localId, Vector3 pos, IClientAPI remoteClient)
        {
-            UpdatePrimGroupPosition(localId, pos, remoteClient.AgentId);
-        }
-        /// <summary>
-        /// Update the position of the given group.
-        /// </summary>
-        /// <param name="localId"></param>
-        /// <param name="pos"></param>
-        /// <param name="updatingAgentId"></param>
-        public void UpdatePrimGroupPosition(uint localId, Vector3 pos, UUID updatingAgentId)
-        {
            SceneObjectGroup group = GetGroupByPrim(localId);
            if (group != null)
@@ -1580,7 +1569,7 @@ namespace OpenSim.Region.Framework.Scenes
                if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0))
                {
                    // Set the new attachment point data in the object
-                    byte attachmentPoint = group.GetAttachmentPoint();
+                    byte attachmentPoint = (byte)group.AttachmentPoint;
                    group.UpdateGroupPosition(pos);
                    group.IsAttachment = false;
                    group.AbsolutePosition = group.RootPart.AttachedPos;
@@ -1589,8 +1578,8 @@ namespace OpenSim.Region.Framework.Scenes
                }
                else
                {
-                    if (m_parentScene.Permissions.CanMoveObject(group.UUID, updatingAgentId)
+                    if (m_parentScene.Permissions.CanMoveObject(group, remoteClient)
-                        && m_parentScene.Permissions.CanObjectEntry(group.UUID, false, pos))
+                        && m_parentScene.Permissions.CanObjectEntry(group, false, pos))
                    {
                        group.UpdateGroupPosition(pos);
                    }
@@ -1614,7 +1603,7 @@ namespace OpenSim.Region.Framework.Scenes
            if (group != null)
            {
-                if (m_parentScene.Permissions.CanEditObject(group.UUID,remoteClient.AgentId))
+                if (m_parentScene.Permissions.CanEditObject(group, remoteClient))
                {
                    group.UpdateTextureEntry(localID, texture);
                }
@@ -1638,7 +1627,7 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = GetGroupByPrim(localID);
            if (group != null)
            {
-                if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId))
+                if (m_parentScene.Permissions.CanEditObject(group, remoteClient))
                {
                    // VolumeDetect can't be set via UI and will always be off when a change is made there
                    // now only change volume dtc if phantom off
@@ -1685,7 +1674,7 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = GetGroupByPrim(primLocalID);
            if (group != null)
            {
-                if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId))
+                if (m_parentScene.Permissions.CanEditObject(group, remoteClient))
                {
                    group.SetPartName(Util.CleanString(name), primLocalID);
                    group.HasGroupChanged = true;
@@ -1703,7 +1692,7 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = GetGroupByPrim(primLocalID);
            if (group != null)
            {
-                if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId))
+                if (m_parentScene.Permissions.CanEditObject(group, remoteClient))
                {
                    group.SetPartDescription(Util.CleanString(description), primLocalID);
                    group.HasGroupChanged = true;
@@ -1725,7 +1714,7 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = GetGroupByPrim(primLocalID);
            if (group != null)
            {
-                if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId))
+                if (m_parentScene.Permissions.CanEditObject(group, remoteClient))
                {
                    SceneObjectPart part = m_parentScene.GetSceneObjectPart(primLocalID);
                    if (part != null)
@@ -1742,7 +1731,7 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = GetGroupByPrim(primLocalID);
            if (group != null)
            {
-                if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId))
+                if (m_parentScene.Permissions.CanEditObject(group, remoteClient))
                {
                    SceneObjectPart part = m_parentScene.GetSceneObjectPart(primLocalID);
                    if (part != null)
@@ -2025,27 +2014,9 @@ namespace OpenSim.Region.Framework.Scenes
        protected internal void MakeObjectSearchable(IClientAPI remoteClient, bool IncludeInSearch, uint localID)
        {
-            UUID user = remoteClient.AgentId;
+            SceneObjectGroup sog = GetGroupByPrim(localID);
-            UUID objid = UUID.Zero;
+            if(sog == null)
-            SceneObjectPart obj = null;
+                return;
-            EntityBase[] entityList = GetEntities();
-            foreach (EntityBase ent in entityList)
-            {
-                if (ent is SceneObjectGroup)
-                {
-                    SceneObjectGroup sog = ent as SceneObjectGroup;
-                    foreach (SceneObjectPart part in sog.Parts)
-                    {
-                        if (part.LocalId == localID)
-                        {
-                            objid = part.UUID;
-                            obj = part;
-                        }
-                    }
-                }
-            }
            //Protip: In my day, we didn't call them searchable objects, we called them limited point-to-point joints
            //aka ObjectFlags.JointWheel = IncludeInSearch
@@ -2062,15 +2033,15 @@ namespace OpenSim.Region.Framework.Scenes
            // libomv will complain about PrimFlags.JointWheel being
            // deprecated, so we
            #pragma warning disable 0612
-            if (IncludeInSearch && m_parentScene.Permissions.CanEditObject(objid, user))
+            if (IncludeInSearch && m_parentScene.Permissions.CanEditObject(sog, remoteClient))
            {
-                obj.ParentGroup.RootPart.AddFlag(PrimFlags.JointWheel);
+                sog.RootPart.AddFlag(PrimFlags.JointWheel);
-                obj.ParentGroup.HasGroupChanged = true;
+                sog.HasGroupChanged = true;
            }
-            else if (!IncludeInSearch && m_parentScene.Permissions.CanMoveObject(objid,user))
+            else if (!IncludeInSearch && m_parentScene.Permissions.CanMoveObject(sog, remoteClient))
            {
-                obj.ParentGroup.RootPart.RemFlag(PrimFlags.JointWheel);
+                sog.RootPart.RemFlag(PrimFlags.JointWheel);
-                obj.ParentGroup.HasGroupChanged = true;
+                sog.HasGroupChanged = true;
            }
            #pragma warning restore 0612
        }
@@ -2086,7 +2057,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="rot"></param>
        /// <returns>null if duplication fails, otherwise the duplicated object</returns>
        /// <summary>
-        public SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot)
+        public SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, UUID AgentID, UUID GroupID, Quaternion rot, bool createSelected)
        {
 //            m_log.DebugFormat(
 //                "[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}",
@@ -2095,27 +2066,28 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup original = GetGroupByPrim(originalPrimID);
            if (original != null)
            {
-                if (m_parentScene.Permissions.CanDuplicateObject(
+                if (m_parentScene.Permissions.CanDuplicateObject(original, AgentID))
-                    original.PrimCount, original.UUID, AgentID, original.AbsolutePosition))
                {
                    SceneObjectGroup copy = original.Copy(true);
                    copy.AbsolutePosition = copy.AbsolutePosition + offset;
+                    SceneObjectPart[] parts = copy.Parts;
+                    m_numTotalPrim += parts.Length;
                    if (original.OwnerID != AgentID)
                    {
-                        copy.SetOwnerId(AgentID);
+                        copy.SetOwner(AgentID, GroupID);
-                        copy.SetRootPartOwner(copy.RootPart, AgentID, GroupID);
-                        SceneObjectPart[] partList = copy.Parts;
                        if (m_parentScene.Permissions.PropagatePermissions())
                        {
-                            foreach (SceneObjectPart child in partList)
+                            foreach (SceneObjectPart child in parts)
                            {
                                child.Inventory.ChangeInventoryOwner(AgentID);
                                child.TriggerScriptChangedEvent(Changed.OWNER);
                                child.ApplyNextOwnerPermissions();
                            }
+                            copy.AggregatePerms();
                        }
                    }
@@ -2125,10 +2097,6 @@ namespace OpenSim.Region.Framework.Scenes
                    lock (SceneObjectGroupsByFullID)
                        SceneObjectGroupsByFullID[copy.UUID] = copy;
-                    SceneObjectPart[] parts = copy.Parts;
-                    m_numTotalPrim += parts.Length;
                    foreach (SceneObjectPart part in parts)
                    {
                        if (part.GetPrimType() == PrimType.SCULPT)
@@ -2144,28 +2112,19 @@ namespace OpenSim.Region.Framework.Scenes
                    // PROBABLE END OF FIXME
-                    // Since we copy from a source group that is in selected
+                    copy.IsSelected = createSelected;
-                    // state, but the copy is shown deselected in the viewer,
-                    // We need to clear the selection flag here, else that
-                    // prim never gets persisted at all. The client doesn't
-                    // think it's selected, so it will never send a deselect...
-                    copy.IsSelected = false;
-                    m_numPrim += copy.Parts.Length;
                    if (rot != Quaternion.Identity)
-                    {
                        copy.UpdateGroupRotationR(rot);
-                    }
+                    // required for physics to update it's position
+                    copy.ResetChildPrimPhysicsPositions();
                    copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 1);
-                    copy.HasGroupChanged = true;
-                    copy.ScheduleGroupForFullUpdate();
                    copy.ResumeScripts();
-                    // required for physics to update it's position
+                    copy.HasGroupChanged = true;
-                    copy.AbsolutePosition = copy.AbsolutePosition;
+                    copy.ScheduleGroupForFullUpdate();
                    return copy;
                }
            }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 9f98554..12e53a8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -111,7 +111,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="item">The user inventory item being added.</param>
        /// <param name="copyItemID">The item UUID that should be used by the new item.</param>
        /// <returns></returns>
-        public bool AddInventoryItem(UUID agentID, uint localID, InventoryItemBase item, UUID copyItemID)
+        public bool AddInventoryItem(UUID agentID, uint localID, InventoryItemBase item, UUID copyItemID, bool withModRights = true)
        {
 //            m_log.DebugFormat(
 //                "[PRIM INVENTORY]: Adding inventory item {0} from {1} to part with local ID {2}",
@@ -120,69 +120,72 @@ namespace OpenSim.Region.Framework.Scenes
            UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID;
            SceneObjectPart part = GetPart(localID);
-            if (part != null)
+            if (part == null)
            {
-                TaskInventoryItem taskItem = new TaskInventoryItem();
+                m_log.ErrorFormat(
+                    "[PRIM INVENTORY]: " +
-                taskItem.ItemID = newItemId;
+                    "Couldn't find prim local ID {0} in group {1}, {2} to add inventory item ID {3}",
-                taskItem.AssetID = item.AssetID;
+                    localID, Name, UUID, newItemId);
-                taskItem.Name = item.Name;
+                return false;
-                taskItem.Description = item.Description;
+            }
-                taskItem.OwnerID = part.OwnerID; // Transfer ownership
-                taskItem.CreatorID = item.CreatorIdAsUuid;
+            TaskInventoryItem taskItem = new TaskInventoryItem();
-                taskItem.Type = item.AssetType;
-                taskItem.InvType = item.InvType;
-                if (agentID != part.OwnerID && m_scene.Permissions.PropagatePermissions())
-                {
-                    taskItem.BasePermissions = item.BasePermissions &
-                            item.NextPermissions;
-                    taskItem.CurrentPermissions = item.CurrentPermissions &
-                            item.NextPermissions;
-                    taskItem.EveryonePermissions = item.EveryOnePermissions &
-                            item.NextPermissions;
-                    taskItem.GroupPermissions = item.GroupPermissions &
-                            item.NextPermissions;
-                    taskItem.NextPermissions = item.NextPermissions;
-                    // We're adding this to a prim we don't own. Force
-                    // owner change
-                    taskItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
-                }
-                else
-                {
-                    taskItem.BasePermissions = item.BasePermissions;
-                    taskItem.CurrentPermissions = item.CurrentPermissions;
-                    taskItem.EveryonePermissions = item.EveryOnePermissions;
-                    taskItem.GroupPermissions = item.GroupPermissions;
-                    taskItem.NextPermissions = item.NextPermissions;
-                }
-                taskItem.Flags = item.Flags;
+            taskItem.ItemID = newItemId;
+            taskItem.AssetID = item.AssetID;
+            taskItem.Name = item.Name;
+            taskItem.Description = item.Description;
+            taskItem.OwnerID = part.OwnerID; // Transfer ownership
+            taskItem.CreatorID = item.CreatorIdAsUuid;
+            taskItem.Type = item.AssetType;
+            taskItem.InvType = item.InvType;
+            if (agentID != part.OwnerID && m_scene.Permissions.PropagatePermissions())
+            {
+                taskItem.BasePermissions = item.BasePermissions &
+                        item.NextPermissions;
+                taskItem.CurrentPermissions = item.CurrentPermissions &
+                        item.NextPermissions;
+                taskItem.EveryonePermissions = item.EveryOnePermissions &
+                        item.NextPermissions;
+                taskItem.GroupPermissions = item.GroupPermissions &
+                        item.NextPermissions;
+                taskItem.NextPermissions = item.NextPermissions;
+                // We're adding this to a prim we don't own. Force
+                // owner change
+                taskItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
+            }
+            else
+            {
+                taskItem.BasePermissions = item.BasePermissions;
+                taskItem.CurrentPermissions = item.CurrentPermissions;
+                taskItem.EveryonePermissions = item.EveryOnePermissions;
+                taskItem.GroupPermissions = item.GroupPermissions;
+                taskItem.NextPermissions = item.NextPermissions;
+            }
+            taskItem.Flags = item.Flags;
 //                m_log.DebugFormat(
 //                    "[PRIM INVENTORY]: Flags are 0x{0:X} for item {1} added to part {2} by {3}",
 //                    taskItem.Flags, taskItem.Name, localID, remoteClient.Name);
-                // TODO: These are pending addition of those fields to TaskInventoryItem
+            // TODO: These are pending addition of those fields to TaskInventoryItem
 //                taskItem.SalePrice = item.SalePrice;
 //                taskItem.SaleType = item.SaleType;
-                taskItem.CreationDate = (uint)item.CreationDate;
+            taskItem.CreationDate = (uint)item.CreationDate;
+                
-                bool addFromAllowedDrop = agentID != part.OwnerID;
+            bool addFromAllowedDrop;
+            if(withModRights)
-                part.Inventory.AddInventoryItem(taskItem, addFromAllowedDrop);
+                addFromAllowedDrop = false;
-                return true;
-            }
            else
-            {
+                addFromAllowedDrop = (part.ParentGroup.RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) != 0;
-                m_log.ErrorFormat(
-                    "[PRIM INVENTORY]: " +
+            part.Inventory.AddInventoryItem(taskItem, addFromAllowedDrop);
-                    "Couldn't find prim local ID {0} in group {1}, {2} to add inventory item ID {3}",
+            part.ParentGroup.AggregatePerms();
-                    localID, Name, UUID, newItemId);
+            return true;
-            }
-            return false;
        }
        /// <summary>
@@ -248,6 +251,194 @@ namespace OpenSim.Region.Framework.Scenes
            return -1;
        }
+        // new test code, to place in better place later
+        private object PermissionsLock = new object();
+        private uint m_EffectiveEveryOnePerms;
+        public uint EffectiveEveryOnePerms
+        {
+            get
+            {
+                // this can't be done here but on every place where a change may happen (rez, (de)link, contents , perms,  etc)
+                // bc this is on heavy duty code paths
+                // but for now we need to test the concept
+//                AggregateDeepPerms();
+                return m_EffectiveEveryOnePerms;
+            }
+        }
+        private uint m_EffectiveGroupPerms;
+        public uint EffectiveGroupPerms
+        {
+            get
+            {
+                // this can't be done here but on every place where a change may happen (rez, (de)link, contents , perms,  etc)
+                // bc this is on heavy duty code paths
+                // but for now we need to test the concept
+//                AggregateDeepPerms();
+                return m_EffectiveGroupPerms;
+            }
+        }
+        private uint m_EffectiveGroupOrEveryOnePerms;
+        public uint EffectiveGroupOrEveryOnePerms
+        {
+            get
+            {
+                // this can't be done here but on every place where a change may happen (rez, (de)link, contents , perms,  etc)
+                // bc this is on heavy duty code paths
+                // but for now we need to test the concept
+//                AggregateDeepPerms();
+                return m_EffectiveGroupOrEveryOnePerms;
+            }
+        }
+        private uint m_EffectiveOwnerPerms;
+        public uint EffectiveOwnerPerms
+        {
+            get
+            {
+                // this can't be done here but on every place where a change may happen (rez, (de)link, contents , perms,  etc)
+                // bc this is on heavy duty code paths
+                // but for now we need to test the concept
+ //               AggregateDeepPerms();
+                return m_EffectiveOwnerPerms;
+            }
+        }
+        // aggregates perms scanning parts and their contents
+        // AggregatePerms does same using cached parts content perms
+        public void AggregateDeepPerms()
+        {
+            lock(PermissionsLock)
+            {
+                // aux
+                const uint allmask = (uint)PermissionMask.AllEffective;
+                const uint movemodmask = (uint)(PermissionMask.Move | PermissionMask.Modify);
+                const uint copytransfermast = (uint)(PermissionMask.Copy | PermissionMask.Transfer);
+                uint basePerms = (RootPart.BaseMask & allmask) | (uint)PermissionMask.Move;
+                bool noBaseTransfer = (basePerms & (uint)PermissionMask.Transfer) == 0;
+                uint rootOwnerPerms = RootPart.OwnerMask;
+                uint owner = rootOwnerPerms;
+                uint rootGroupPerms = RootPart.GroupMask;
+                uint group = rootGroupPerms;
+                uint rootEveryonePerms = RootPart.EveryoneMask;
+                uint everyone = rootEveryonePerms;
+                SceneObjectPart[] parts = m_parts.GetArray();
+                for (int i = 0; i < parts.Length; i++)
+                {
+                    SceneObjectPart part = parts[i];
+                    part.AggregateInnerPerms();
+                    owner &= part.AggregatedInnerOwnerPerms; 
+                    group &= part.AggregatedInnerGroupPerms;
+                    everyone &= part.AggregatedInnerEveryonePerms;
+                }
+                // recover modify and move
+                rootOwnerPerms &= movemodmask;
+                owner |= rootOwnerPerms;
+                if((owner & copytransfermast) == 0)
+                    owner |= (uint)PermissionMask.Transfer;
+                owner &= basePerms;
+                m_EffectiveOwnerPerms = owner;
+                uint ownertransfermask = owner & (uint)PermissionMask.Transfer;
+                // recover modify and move
+                rootGroupPerms &= movemodmask;
+                group |= rootGroupPerms;
+                if(noBaseTransfer)
+                    group &=~(uint)PermissionMask.Copy;
+                else
+                    group |= ownertransfermask;
+                uint groupOrEveryone = group;
+                m_EffectiveGroupPerms = group & owner;
+                // recover move
+                rootEveryonePerms &= (uint)PermissionMask.Move;
+                everyone |= rootEveryonePerms;
+                everyone &= ~(uint)PermissionMask.Modify;
+                if(noBaseTransfer)
+                    everyone &=~(uint)PermissionMask.Copy;
+                else
+                    everyone |= ownertransfermask;
+                groupOrEveryone |= everyone;
+                m_EffectiveEveryOnePerms = everyone  & owner;
+                m_EffectiveGroupOrEveryOnePerms = groupOrEveryone  & owner;
+            }
+        }
+        // aggregates perms scanning parts, assuming their contents was already aggregated and cached
+        // ie is AggregateDeepPerms without the part.AggregateInnerPerms() call on parts loop
+        public void AggregatePerms()
+        {
+            lock(PermissionsLock)
+            {
+                // aux
+                const uint allmask = (uint)PermissionMask.AllEffective;
+                const uint movemodmask = (uint)(PermissionMask.Move | PermissionMask.Modify);
+                const uint copytransfermast = (uint)(PermissionMask.Copy | PermissionMask.Transfer);
+                uint basePerms = (RootPart.BaseMask & allmask) | (uint)PermissionMask.Move;
+                bool noBaseTransfer = (basePerms & (uint)PermissionMask.Transfer) == 0;
+                uint rootOwnerPerms = RootPart.OwnerMask;
+                uint owner = rootOwnerPerms;
+                uint rootGroupPerms = RootPart.GroupMask;
+                uint group = rootGroupPerms;
+                uint rootEveryonePerms = RootPart.EveryoneMask;
+                uint everyone = rootEveryonePerms;
+                SceneObjectPart[] parts = m_parts.GetArray();
+                for (int i = 0; i < parts.Length; i++)
+                {
+                    SceneObjectPart part = parts[i];
+                    owner &= part.AggregatedInnerOwnerPerms; 
+                    group &= part.AggregatedInnerGroupPerms;
+                    everyone &= part.AggregatedInnerEveryonePerms;
+                }
+                // recover modify and move
+                rootOwnerPerms &= movemodmask;
+                owner |= rootOwnerPerms;
+                if((owner & copytransfermast) == 0)
+                    owner |= (uint)PermissionMask.Transfer;
+                owner &= basePerms;
+                m_EffectiveOwnerPerms = owner;
+                uint ownertransfermask = owner & (uint)PermissionMask.Transfer;
+                // recover modify and move
+                rootGroupPerms &= movemodmask;
+                group |= rootGroupPerms;
+                if(noBaseTransfer)
+                    group &=~(uint)PermissionMask.Copy;
+                else
+                    group |= ownertransfermask;
+                uint groupOrEveryone = group;
+                m_EffectiveGroupPerms = group & owner;
+                // recover move
+                rootEveryonePerms &= (uint)PermissionMask.Move;
+                everyone |= rootEveryonePerms;
+                everyone &= ~(uint)PermissionMask.Modify;
+                if(noBaseTransfer)
+                    everyone &=~(uint)PermissionMask.Copy;
+                else
+                    everyone |= ownertransfermask;
+                groupOrEveryone |= everyone;
+                m_EffectiveEveryOnePerms = everyone  & owner;
+                m_EffectiveGroupOrEveryOnePerms = groupOrEveryone  & owner;
+            }
+        }
        public uint GetEffectivePermissions()
        {
            return GetEffectivePermissions(false);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6332beb..bf4d60c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -647,7 +647,7 @@ namespace OpenSim.Region.Framework.Scenes
                    localIDs.Add(sog.RootPart.LocalId);
                    sogScene.AddReturn(sog.OwnerID, sog.Name, sog.AbsolutePosition,
                        "Returned at region cross");
-                    sogScene.DeRezObjects(null, localIDs, UUID.Zero, DeRezAction.Return, UUID.Zero);
+                    sogScene.DeRezObjects(null, localIDs, UUID.Zero, DeRezAction.Return, UUID.Zero, false);
                }
                catch (Exception)
                {
@@ -1785,63 +1785,6 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
-        /// <summary>
-        /// Attach this scene object to the given avatar.
-        /// </summary>
-        /// <param name="agentID"></param>
-        /// <param name="attachmentpoint"></param>
-        /// <param name="AttachOffset"></param>
-        private void AttachToAgent(
-            ScenePresence avatar, SceneObjectGroup so, uint attachmentpoint, Vector3 attachOffset, bool silent)
-        {
-            if (avatar != null)
-            {
-                // don't attach attachments to child agents
-                if (avatar.IsChildAgent) return;
-                // Remove from database and parcel prim count
-                m_scene.DeleteFromStorage(so.UUID);
-                m_scene.EventManager.TriggerParcelPrimCountTainted();
-                so.AttachedAvatar = avatar.UUID;
-                if (so.RootPart.PhysActor != null)
-                {
-                    m_scene.PhysicsScene.RemovePrim(so.RootPart.PhysActor);
-                    so.RootPart.PhysActor = null;
-                }
-                so.AbsolutePosition = attachOffset;
-                so.RootPart.AttachedPos = attachOffset;
-                so.IsAttachment = true;
-                so.RootPart.SetParentLocalId(avatar.LocalId);
-                so.AttachmentPoint = attachmentpoint;
-                avatar.AddAttachment(this);
-                if (!silent)
-                {
-                    // Killing it here will cause the client to deselect it
-                    // It then reappears on the avatar, deselected
-                    // through the full update below
-                    //
-                    if (IsSelected)
-                    {
-                        m_scene.SendKillObject(new List<uint> { m_rootPart.LocalId });
-                    }
-                    IsSelected = false; // fudge....
-                    ScheduleGroupForFullUpdate();
-                }
-            }
-            else
-            {
-                m_log.WarnFormat(
-                    "[SOG]: Tried to add attachment {0} to avatar with UUID {1} in region {2} but the avatar is not present",
-                    UUID, avatar.ControllingClient.AgentId, Scene.RegionInfo.RegionName);
-            }
-        }
        public byte GetAttachmentPoint()
        {
            return m_rootPart.Shape.State;
@@ -2313,7 +2256,7 @@ namespace OpenSim.Region.Framework.Scenes
                                     RootPart.UUID);
                                m_scene.AddReturn(OwnerID == GroupID ? LastOwnerID : OwnerID, Name, AbsolutePosition, "parcel autoreturn");
                                m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero,
-                                        DeRezAction.Return, UUID.Zero);
+                                        DeRezAction.Return, UUID.Zero, false);
                                return;
                            }
@@ -2443,17 +2386,16 @@ namespace OpenSim.Region.Framework.Scenes
            dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed);
            dupe.m_rootPart.LinkNum = m_rootPart.LinkNum;
            if (userExposed)
                dupe.m_rootPart.TrimPermissions();
            List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.GetArray());
            partList.Sort(delegate(SceneObjectPart p1, SceneObjectPart p2)
-            {
+                    {
-                return p1.LinkNum.CompareTo(p2.LinkNum);
+                        return p1.LinkNum.CompareTo(p2.LinkNum);
-            }
+                    }
-            );
+                );
            foreach (SceneObjectPart part in partList)
            {
@@ -2505,10 +2447,12 @@ namespace OpenSim.Region.Framework.Scenes
                if (dupe.m_rootPart.PhysActor != null)
                    dupe.m_rootPart.PhysActor.Building = false; // tell physics to finish building
+                dupe.AggregateDeepPerms();
                dupe.HasGroupChanged = true;
                dupe.AttachToBackup();
-                ScheduleGroupForFullUpdate();
+                dupe.ScheduleGroupForFullUpdate();
            }
            m_dupeInProgress = false;
@@ -2746,25 +2690,33 @@ namespace OpenSim.Region.Framework.Scenes
        }
        /// <summary>
-        /// Set the owner of the root part.
+        /// Set the owner of all linkset.
        /// </summary>
-        /// <param name="part"></param>
        /// <param name="cAgentID"></param>
        /// <param name="cGroupID"></param>
-        public void SetRootPartOwner(SceneObjectPart part, UUID cAgentID, UUID cGroupID)
+        public void SetOwner(UUID cAgentID, UUID cGroupID)
        {
-            part.LastOwnerID = part.OwnerID;
+            SceneObjectPart rpart = RootPart;
-            part.OwnerID = cAgentID;
+            UUID oldowner = rpart.OwnerID;
-            part.GroupID = cGroupID;
+            ForEachPart(delegate(SceneObjectPart part)
+            {
+                if(part.GroupID != part.OwnerID)
+                    part.LastOwnerID = part.OwnerID;
+                part.OwnerID = cAgentID;
+                part.GroupID = cGroupID;
+                });
-            if (part.OwnerID != cAgentID)
+            if (oldowner != cAgentID)
            {
                // Apply Next Owner Permissions if we're not bypassing permissions
                if (!m_scene.Permissions.BypassPermissions())
+                {
                    ApplyNextOwnerPermissions();
+                    AggregatePerms();
+                }
            }
-            part.ScheduleFullUpdate();
+            rpart.ScheduleFullUpdate();
        }
        /// <summary>
@@ -3420,6 +3372,7 @@ namespace OpenSim.Region.Framework.Scenes
            objectGroup.HasGroupChangedDueToDelink = true;
            InvalidBoundsRadius();
+            objectGroup.AggregatePerms();
            if (sendEvents)
                linkPart.TriggerScriptChangedEvent(Changed.LINK);
@@ -3958,8 +3911,8 @@ namespace OpenSim.Region.Framework.Scenes
        public void AdjustChildPrimPermissions(bool forceTaskInventoryPermissive)
        {
-            uint newOwnerMask = (uint)(PermissionMask.All | PermissionMask.Export) & 0xfffffff8; // Mask folded bits
+            uint newOwnerMask = (uint)(PermissionMask.All | PermissionMask.Export) & 0xfffffff0; // Mask folded bits
-            uint foldedPerms = RootPart.OwnerMask & 3;
+            uint foldedPerms = RootPart.OwnerMask & (uint)PermissionMask.FoldedMask;
            ForEachPart(part =>
            {
@@ -3970,14 +3923,14 @@ namespace OpenSim.Region.Framework.Scenes
                    part.Inventory.ApplyGodPermissions(part.BaseMask);
            });
-            uint lockMask = ~(uint)(PermissionMask.Move | PermissionMask.Modify);
+            uint lockMask = ~(uint)(PermissionMask.Move);
-            uint lockBit = RootPart.OwnerMask & (uint)(PermissionMask.Move | PermissionMask.Modify);
+            uint lockBit = RootPart.OwnerMask & (uint)(PermissionMask.Move);
            RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask);
 //            m_log.DebugFormat(
 //                "[SCENE OBJECT GROUP]: RootPart.OwnerMask now {0} for {1} in {2}",
 //                (OpenMetaverse.PermissionMask)RootPart.OwnerMask, Name, Scene.Name);
+            AggregatePerms();
            RootPart.ScheduleFullUpdate();
        }
@@ -4002,6 +3955,7 @@ namespace OpenSim.Region.Framework.Scenes
            {
                foreach (SceneObjectPart part in Parts)
                    part.Inventory.ApplyGodPermissions(RootPart.BaseMask);
+                AggregatePerms();
            }
            HasGroupChanged = true;
@@ -4647,7 +4601,7 @@ namespace OpenSim.Region.Framework.Scenes
                        }
                        if ((change & ObjectChangeType.Position) != 0)
                        {
-                            if (IsAttachment || m_scene.Permissions.CanObjectEntry(group.UUID, false, data.position))
+                            if (IsAttachment || m_scene.Permissions.CanObjectEntry(group, false, data.position))
                                UpdateGroupPosition(data.position);
                            updateType = updatetype.groupterse;
                        }
@@ -5217,6 +5171,7 @@ namespace OpenSim.Region.Framework.Scenes
            {
                part.ResetOwnerChangeFlag();
            });
+            AggregatePerms();
        }
        // clear some references to easy cg
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 557b55e..bf0e31b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -244,11 +244,6 @@ namespace OpenSim.Region.Framework.Scenes
        public uint TimeStampTerse;
-        // The following two are to hold the attachment data
-        // while an object is inworld
-        [XmlIgnore]
-        public byte AttachPoint = 0;
        [XmlIgnore]
        public Quaternion AttachRotation = Quaternion.Identity;
@@ -277,7 +272,11 @@ namespace OpenSim.Region.Framework.Scenes
        public scriptEvents AggregateScriptEvents;
-        public Vector3 AttachedPos;
+        public Vector3 AttachedPos
+        {
+            get;
+            set;
+        }
        // rotation locks on local X,Y and or Z axis bit flags
        // bits are as in llSetStatus defined in SceneObjectGroup.axisSelect enum
@@ -476,8 +475,8 @@ namespace OpenSim.Region.Framework.Scenes
            APIDActive = false;
            Flags = 0;
            CreateSelected = true;
            TrimPermissions();
+            AggregateInnerPerms();
        }
        #endregion Constructors
@@ -2228,7 +2227,11 @@ namespace OpenSim.Region.Framework.Scenes
            dupe.LocalId = plocalID;
            // This may be wrong...    it might have to be applied in SceneObjectGroup to the object that's being duplicated.
-            dupe.LastOwnerID = OwnerID;
+            if(OwnerID != GroupID)
+                dupe.LastOwnerID = OwnerID;
+            else
+                dupe.LastOwnerID = LastOwnerID; // redundant ?
            dupe.RezzerID = RezzerID;
            byte[] extraP = new byte[Shape.ExtraParams.Length];
@@ -2537,6 +2540,35 @@ namespace OpenSim.Region.Framework.Scenes
            return (uint)Flags | (uint)LocalFlags;
        }
+        // some of this lines need be moved to other place later
+        // effective permitions considering only this part inventory contents perms
+        public uint AggregatedInnerOwnerPerms {get; private set; }
+        public uint AggregatedInnerGroupPerms {get; private set; }
+        public uint AggregatedInnerEveryonePerms {get; private set; }
+        private object InnerPermsLock = new object();
+        public void AggregateInnerPerms()
+        {
+            // assuming child prims permissions masks are irrelevant on a linkset
+            // root part is handle at SOG since its masks are the sog masks
+            const uint mask = (uint)PermissionMask.AllEffective;
+            uint owner = mask;
+            uint group = mask;
+            uint everyone = mask;
+            lock(InnerPermsLock) // do we really need this?
+            {
+                if(Inventory != null)
+                    Inventory.AggregateInnerPerms(ref owner, ref group, ref everyone);
+            
+                AggregatedInnerOwnerPerms = owner & mask;
+                AggregatedInnerGroupPerms = group & mask;
+                AggregatedInnerEveryonePerms = everyone & mask;
+            }
+        }
        public Vector3 GetGeometricCenter()
        {
            // this is not real geometric center but a average of positions relative to root prim acording to
@@ -4464,7 +4496,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                        break;
                }
+                AggregateInnerPerms();
                SendFullUpdateToAllClients();
            }
        }
@@ -4481,6 +4513,8 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
            EveryoneMask = source.EveryoneMask & BaseMask;
            NextOwnerMask = source.NextOwnerMask & BaseMask;
+            AggregateInnerPerms();
            if (OwnerMask != prevOwnerMask ||
                GroupMask != prevGroupMask ||
                EveryoneMask != prevEveryoneMask ||
@@ -5212,16 +5246,13 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
            if (OwnerID != item.Owner)
            {
-                //LogPermissions("Before ApplyNextOwnerPermissions");
+                if(OwnerID != GroupID)
+                    LastOwnerID = OwnerID;
+                OwnerID = item.Owner;
+                Inventory.ChangeInventoryOwner(item.Owner);
                if (scene.Permissions.PropagatePermissions())
                    ApplyNextOwnerPermissions();
-                //LogPermissions("After ApplyNextOwnerPermissions");
-                LastOwnerID = OwnerID;
-                OwnerID = item.Owner;
-                Inventory.ChangeInventoryOwner(item.Owner);
            }
        }
@@ -5245,6 +5276,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
            GroupMask = 0; // Giving an object zaps group permissions
            Inventory.ApplyNextOwnerPermissions();
+            AggregateInnerPerms();
        }
        public void UpdateLookAt()
@@ -5306,6 +5338,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                item.OwnerChanged = false;
                Inventory.UpdateInventoryItem(item, false, false);
            }
+            AggregateInnerPerms();
        }
        /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index bf56de2..b53c355 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -360,7 +360,7 @@ namespace OpenSim.Region.Framework.Scenes
 //             m_log.DebugFormat("[PRIM INVENTORY]: Starting script {0} {1} in prim {2} {3} in {4}",
 //                 item.Name, item.ItemID, m_part.Name, m_part.UUID, m_part.ParentGroup.Scene.RegionInfo.RegionName);
-            if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID))
+            if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item, m_part))
            {
                StoreScriptError(item.ItemID, "no permission");
                return false;
@@ -807,6 +807,7 @@ namespace OpenSim.Region.Framework.Scenes
                else
                    m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
+            m_part.AggregateInnerPerms();
            m_inventorySerial++;
            //m_inventorySerial += 2;
            HasInventoryChanged = true;
@@ -829,7 +830,7 @@ namespace OpenSim.Region.Framework.Scenes
 //                m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
            }
            m_items.LockItemsForWrite(false);
+            m_part.AggregateInnerPerms();
            m_inventorySerial++;
        }
@@ -965,7 +966,8 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    if ((part.OwnerID != item.OwnerID) || (item.CurrentPermissions & (uint)PermissionMask.Slam) != 0 || (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0)
                    {
-                        part.LastOwnerID = part.OwnerID;
+                        if(part.GroupID != part.OwnerID)
+                            part.LastOwnerID = part.OwnerID;
                        part.OwnerID = item.OwnerID;
                        part.Inventory.ChangeInventoryOwner(item.OwnerID);
                    }
@@ -979,6 +981,7 @@ namespace OpenSim.Region.Framework.Scenes
                }
 // old code end
                rootPart.TrimPermissions();
+                group.AggregateDeepPerms();
            }
            return true;
@@ -1020,16 +1023,20 @@ namespace OpenSim.Region.Framework.Scenes
                    item.AssetID = m_items[item.ItemID].AssetID;
                m_items[item.ItemID] = item;
                m_inventorySerial++;
                if (fireScriptEvents)
                    m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
                if (considerChanged)
                {
+                    m_part.AggregateInnerPerms();
+                    m_part.ParentGroup.AggregatePerms();
                    HasInventoryChanged = true;
                    m_part.ParentGroup.HasGroupChanged = true;
                }
                m_items.LockItemsForWrite(false);
                return true;
            }
            else
@@ -1066,6 +1073,10 @@ namespace OpenSim.Region.Framework.Scenes
                m_items.LockItemsForWrite(true);
                m_items.Remove(itemID);
                m_items.LockItemsForWrite(false);
+                m_part.AggregateInnerPerms();
+                m_part.ParentGroup.AggregatePerms();
                m_inventorySerial++;
                m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
@@ -1317,6 +1328,16 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        public void AggregateInnerPerms(ref uint owner, ref uint group, ref uint everyone)
+        {
+            foreach (TaskInventoryItem item in m_items.Values)
+            {
+                owner &= item.CurrentPermissions;
+                group &= item.GroupPermissions;
+                everyone &= item.EveryonePermissions;
+            }
+        }
        public uint MaskEffectivePermissions()
        {
            uint mask=0x7fffffff;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9545c13..a5af7e1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2029,11 +2029,6 @@ namespace OpenSim.Region.Framework.Scenes
                    m_log.DebugFormat("[CompleteMovement]: Missing COF for {0} is {1}", client.AgentId, COF);
                }
-                // Tell the client that we're totally ready
-                ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
-                m_log.DebugFormat("[CompleteMovement] MoveAgentIntoRegion: {0}ms", Util.EnvironmentTickCountSubtract(ts));
                if (!string.IsNullOrEmpty(m_callbackURI))
                {
                    // We cannot sleep here since this would hold up the inbound packet processing thread, as
@@ -2054,6 +2049,7 @@ namespace OpenSim.Region.Framework.Scenes
                    Scene.SimulationService.ReleaseAgent(originID, UUID, m_callbackURI);
                    m_callbackURI = null;
+                    m_log.DebugFormat("[CompleteMovement] ReleaseAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));
                }
 //            else
 //            {
@@ -2062,19 +2058,48 @@ namespace OpenSim.Region.Framework.Scenes
 //                    client.Name, client.AgentId, m_scene.RegionInfo.RegionName);
 //            }
-                m_log.DebugFormat("[CompleteMovement] ReleaseAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));
+                // Tell the client that we're totally ready
+                ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
+                m_log.DebugFormat("[CompleteMovement] MoveAgentIntoRegion: {0}ms", Util.EnvironmentTickCountSubtract(ts));
+                bool isHGTP = (m_teleportFlags & TeleportFlags.ViaHGLogin) != 0;
+                int delayctnr = Util.EnvironmentTickCount();
+                if (!IsChildAgent)
+                {
+                    // verify baked textures and cache
+                    bool cachedbaked = false;
+                    if (IsNPC)
+                        cachedbaked = true;
+                    else
+                    {
+                        if (m_scene.AvatarFactory != null && !isHGTP)
+                            cachedbaked = m_scene.AvatarFactory.ValidateBakedTextureCache(this);
+                        // not sure we need this
+                        if (!cachedbaked)
+                        {
+                            if (m_scene.AvatarFactory != null)
+                                m_scene.AvatarFactory.QueueAppearanceSave(UUID);
+                        }
+                    }
+                    m_log.DebugFormat("[CompleteMovement] Baked check: {0}ms", Util.EnvironmentTickCountSubtract(ts));
+                }
                if(m_teleportFlags > 0)
                {
                    gotCrossUpdate = false; // sanity check
-                    Thread.Sleep(500);  // let viewers catch us
+                    if(Util.EnvironmentTickCountSubtract(delayctnr)< 500)
+                        Thread.Sleep(500);  // let viewers catch us
                }
                if(!gotCrossUpdate)
                    RotateToLookAt(look);
                // HG
-                bool isHGTP = (m_teleportFlags & TeleportFlags.ViaHGLogin) != 0;
                if(isHGTP)
                {
 //                    ControllingClient.SendNameReply(m_uuid, Firstname, Lastname);
@@ -2101,24 +2126,6 @@ namespace OpenSim.Region.Framework.Scenes
                if (!IsChildAgent)
                {
-                    // verify baked textures and cache
-                    bool cachedbaked = false;
-                    if (IsNPC)
-                        cachedbaked = true;
-                    else
-                    {
-                        if (m_scene.AvatarFactory != null && !isHGTP)
-                            cachedbaked = m_scene.AvatarFactory.ValidateBakedTextureCache(this);
-                        // not sure we need this
-                        if (!cachedbaked)
-                        {
-                            if (m_scene.AvatarFactory != null)
-                                m_scene.AvatarFactory.QueueAppearanceSave(UUID);
-                        }
-                    }
                    List<ScenePresence> allpresences = m_scene.GetScenePresences();
                    // send avatar object to all presences including us, so they cross it into region
@@ -3110,6 +3117,7 @@ namespace OpenSim.Region.Framework.Scenes
                Vector3 standPos = sitPartWorldPosition + adjustmentForSitPose;
                m_pos = standPos;
            }
            // We need to wait until we have calculated proper stand positions before sitting up the physical
@@ -3124,6 +3132,7 @@ namespace OpenSim.Region.Framework.Scenes
                part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
                SendAvatarDataToAllAgents();
+                m_scene.EventManager.TriggerParcelPrimCountTainted(); // update select/ sat on
            }
            // reset to default sitAnimation
@@ -3256,6 +3265,7 @@ namespace OpenSim.Region.Framework.Scenes
                // Moved here to avoid a race with default sit anim
                // The script event needs to be raised after the default sit anim is set.
                part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
+                m_scene.EventManager.TriggerParcelPrimCountTainted(); // update select/ sat on
            }
        }
@@ -3405,6 +3415,7 @@ namespace OpenSim.Region.Framework.Scenes
            Animator.SetMovementAnimations("SIT");
            part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
+            m_scene.EventManager.TriggerParcelPrimCountTainted(); // update select/ sat on
        }
        public void HandleAgentSit(IClientAPI remoteClient, UUID agentID)
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index b8d210c..a12a401 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
            // Script state may, or may not, exist. Not having any, is NOT
            // ever a problem.
            sceneObject.LoadScriptState(reader);
+            sceneObject.AggregateDeepPerms();
            return sceneObject;
        }
@@ -278,7 +278,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                // Script state may, or may not, exist. Not having any, is NOT
                // ever a problem.
                sceneObject.LoadScriptState(doc);
+                sceneObject.AggregatePerms();
                return sceneObject;
            }
            catch (Exception e)
@@ -1739,6 +1739,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
            reader.ReadEndElement(); // SceneObjectPart
+            obj.AggregateInnerPerms();
            // m_log.DebugFormat("[SceneObjectSerializer]: parsed SOP {0} {1}", obj.Name, obj.UUID);
            return obj;
        }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
index 01bc491..0f022dd 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -70,6 +70,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                    //obj.RegenerateFullIDs();
                    scene.AddNewSceneObject(obj, true);
+                    obj.AggregateDeepPerms();
                }
            }
            else
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
index 56723bf..4d2eb3f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            SceneObjectGroup dupeSo
                = scene.SceneGraph.DuplicateObject(
-                    part1.LocalId, new Vector3(10, 0, 0), 0, ownerId, UUID.Zero, Quaternion.Identity);
+                    part1.LocalId, new Vector3(10, 0, 0), ownerId, UUID.Zero, Quaternion.Identity, false);
            Assert.That(dupeSo.Parts.Length, Is.EqualTo(2));
            SceneObjectPart dupePart1 = dupeSo.GetLinkNumPart(1);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
index e1e973c..abf8c48 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
@@ -157,29 +157,28 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            // Cross
            sceneA.SceneGraph.UpdatePrimGroupPosition(
-                so1.LocalId, new Vector3(so1StartPos.X, so1StartPos.Y - 20, so1StartPos.Z), userId);
+                so1.LocalId, new Vector3(so1StartPos.X, so1StartPos.Y - 20, so1StartPos.Z), sp1SceneA.ControllingClient);
            // crossing is async
            Thread.Sleep(500);
            SceneObjectGroup so1PostCross;
-            {
+            ScenePresence sp1SceneAPostCross = sceneA.GetScenePresence(userId);
-                ScenePresence sp1SceneAPostCross = sceneA.GetScenePresence(userId);
+            Assert.IsTrue(sp1SceneAPostCross.IsChildAgent, "sp1SceneAPostCross.IsChildAgent unexpectedly false");
-                Assert.IsTrue(sp1SceneAPostCross.IsChildAgent, "sp1SceneAPostCross.IsChildAgent unexpectedly false");
-                ScenePresence sp1SceneBPostCross = sceneB.GetScenePresence(userId);
+            ScenePresence sp1SceneBPostCross = sceneB.GetScenePresence(userId);
-                TestClient sceneBTc = ((TestClient)sp1SceneBPostCross.ControllingClient);
+            TestClient sceneBTc = ((TestClient)sp1SceneBPostCross.ControllingClient);
-                sceneBTc.CompleteMovement();
+            sceneBTc.CompleteMovement();
-                Assert.IsFalse(sp1SceneBPostCross.IsChildAgent, "sp1SceneAPostCross.IsChildAgent unexpectedly true");
+            Assert.IsFalse(sp1SceneBPostCross.IsChildAgent, "sp1SceneAPostCross.IsChildAgent unexpectedly true");
-                Assert.IsTrue(sp1SceneBPostCross.IsSatOnObject);
+            Assert.IsTrue(sp1SceneBPostCross.IsSatOnObject);
+            Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id), "uck");
+            so1PostCross = sceneB.GetSceneObjectGroup(so1Id);
+            Assert.NotNull(so1PostCross);
+            Assert.AreEqual(1, so1PostCross.GetSittingAvatarsCount());
-                Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id), "uck");
-                so1PostCross = sceneB.GetSceneObjectGroup(so1Id);
-                Assert.NotNull(so1PostCross);
-                Assert.AreEqual(1, so1PostCross.GetSittingAvatarsCount());
-            }
            Vector3 so1PostCrossPos = so1PostCross.AbsolutePosition;
@@ -187,7 +186,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            // Recross
            sceneB.SceneGraph.UpdatePrimGroupPosition(
-                so1PostCross.LocalId, new Vector3(so1PostCrossPos.X, so1PostCrossPos.Y + 20, so1PostCrossPos.Z), userId);
+                so1PostCross.LocalId, new Vector3(so1PostCrossPos.X, so1PostCrossPos.Y + 20, so1PostCrossPos.Z), sp1SceneBPostCross.ControllingClient);
            // crossing is async
            Thread.Sleep(500);
@@ -255,13 +254,19 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            lmmA.EventManagerOnNoLandDataFromStorage();
            lmmB.EventManagerOnNoLandDataFromStorage();
+            AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
+            TestClient tc = new TestClient(acd, sceneA);
+            List<TestClient> destinationTestClients = new List<TestClient>();
+            EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(tc, destinationTestClients);
+            ScenePresence sp1SceneA = SceneHelpers.AddScenePresence(sceneA, tc, acd);
            SceneObjectGroup so1 = SceneHelpers.AddSceneObject(sceneA, 1, userId, "", sceneObjectIdTail);
            UUID so1Id = so1.UUID;
            so1.AbsolutePosition = new Vector3(128, 10, 20);
            // Cross with a negative value.  We must make this call rather than setting AbsolutePosition directly
            // because only this will execute permission checks in the source region.
-            sceneA.SceneGraph.UpdatePrimGroupPosition(so1.LocalId, new Vector3(128, -10, 20), userId);
+            sceneA.SceneGraph.UpdatePrimGroupPosition(so1.LocalId, new Vector3(128, -10, 20), sp1SceneA.ControllingClient);
            // crossing is async
            Thread.Sleep(500);
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
index ed27385..92b5831 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
@@ -134,11 +134,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
        private int llAttachToAvatarTemp(UUID host, UUID script, int attachmentPoint)
        {
            SceneObjectPart hostPart = m_scene.GetSceneObjectPart(host);
            if (hostPart == null)
                return 0;
-            if (hostPart.ParentGroup.IsAttachment)
+            SceneObjectGroup hostgroup = hostPart.ParentGroup;
+            if (hostgroup== null || hostgroup.IsAttachment)
                return 0;
            IAttachmentsModule attachmentsModule = m_scene.RequestModuleInterface<IAttachmentsModule>();
@@ -156,32 +157,32 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
            if (!m_scene.TryGetScenePresence(item.PermsGranter, out target))
                return 0;
-            if (target.UUID != hostPart.ParentGroup.OwnerID)
+            if (target.UUID != hostgroup.OwnerID)
            {
-                uint effectivePerms = hostPart.ParentGroup.GetEffectivePermissions();
+                uint effectivePerms = hostgroup.EffectiveOwnerPerms;
                if ((effectivePerms & (uint)PermissionMask.Transfer) == 0)
                    return 0;
-                hostPart.ParentGroup.SetOwnerId(target.UUID);
+                hostgroup.SetOwner(target.UUID, target.ControllingClient.ActiveGroupId);
-                hostPart.ParentGroup.SetRootPartOwner(hostPart.ParentGroup.RootPart, target.UUID, target.ControllingClient.ActiveGroupId);
                if (m_scene.Permissions.PropagatePermissions())
                {
-                    foreach (SceneObjectPart child in hostPart.ParentGroup.Parts)
+                    foreach (SceneObjectPart child in hostgroup.Parts)
                    {
                        child.Inventory.ChangeInventoryOwner(target.UUID);
                        child.TriggerScriptChangedEvent(Changed.OWNER);
                        child.ApplyNextOwnerPermissions();
                    }
+                    hostgroup.AggregatePerms();
                }
-                hostPart.ParentGroup.RootPart.ObjectSaleType = 0;
+                hostgroup.RootPart.ObjectSaleType = 0;
-                hostPart.ParentGroup.RootPart.SalePrice = 10;
+                hostgroup.RootPart.SalePrice = 10;
-                hostPart.ParentGroup.HasGroupChanged = true;
+                hostgroup.HasGroupChanged = true;
-                hostPart.ParentGroup.RootPart.SendPropertiesToClient(target.ControllingClient);
+                hostgroup.RootPart.SendPropertiesToClient(target.ControllingClient);
-                hostPart.ParentGroup.RootPart.ScheduleFullUpdate();
+                hostgroup.RootPart.ScheduleFullUpdate();
            }
            return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, false, true) ? 1 : 0;
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
index 9c0fa75..af32d05 100644
--- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
+++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Region.OptionalModules
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private bool m_enabled;
+        private Scene m_scene;
        public string Name { get { return "PrimLimitsModule"; } }
        public Type ReplaceableInterface { get { return null; } }
@@ -77,9 +78,9 @@ namespace OpenSim.Region.OptionalModules
        public void AddRegion(Scene scene)
        {
            if (!m_enabled)
-            {
                return;
-            }
+            m_scene = scene;
            scene.Permissions.OnRezObject += CanRezObject;
            scene.Permissions.OnObjectEntry += CanObjectEnter;
            scene.Permissions.OnDuplicateObject += CanDuplicateObject;
@@ -89,14 +90,12 @@ namespace OpenSim.Region.OptionalModules
        public void RemoveRegion(Scene scene)
        {
-            if (m_enabled)
+            if (!m_enabled)
-            {
                return;
-            }
-            scene.Permissions.OnRezObject -= CanRezObject;
+            m_scene.Permissions.OnRezObject -= CanRezObject;
-            scene.Permissions.OnObjectEntry -= CanObjectEnter;
+            m_scene.Permissions.OnObjectEntry -= CanObjectEnter;
-            scene.Permissions.OnDuplicateObject -= CanDuplicateObject;
+            m_scene.Permissions.OnDuplicateObject -= CanDuplicateObject;
        }
        public void RegionLoaded(Scene scene)
@@ -104,11 +103,12 @@ namespace OpenSim.Region.OptionalModules
            m_dialogModule = scene.RequestModuleInterface<IDialogModule>();
        }
-        private bool CanRezObject(int objectCount, UUID ownerID, Vector3 objectPosition, Scene scene)
+        private bool CanRezObject(int objectCount, UUID ownerID, Vector3 objectPosition)
        {
-            ILandObject lo = scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
+            
+            ILandObject lo = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
-            string response = DoCommonChecks(objectCount, ownerID, lo, scene);
+            string response = DoCommonChecks(objectCount, ownerID, lo);
            if (response != null)
            {
@@ -119,88 +119,79 @@ namespace OpenSim.Region.OptionalModules
        }
        //OnDuplicateObject
-        private bool CanDuplicateObject(int objectCount, UUID objectID, UUID ownerID, Scene scene, Vector3 objectPosition)
+        private bool CanDuplicateObject(SceneObjectGroup sog, ScenePresence sp)
        {
-            ILandObject lo = scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
+            Vector3 objectPosition = sog.AbsolutePosition;
+            ILandObject lo = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
-            string response = DoCommonChecks(objectCount, ownerID, lo, scene);
+            string response = DoCommonChecks(sog.PrimCount, sp.UUID, lo);
            if (response != null)
            {
-                m_dialogModule.SendAlertToUser(ownerID, response);
+                m_dialogModule.SendAlertToUser(sp.UUID, response);
                return false;
            }
            return true;
        }
-        private bool CanObjectEnter(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene)
+        private bool CanObjectEnter(SceneObjectGroup sog, bool enteringRegion, Vector3 newPoint)
        {
-            if (newPoint.X < -1f || newPoint.X > (scene.RegionInfo.RegionSizeX + 1) ||
+            float newX = newPoint.X;
-                newPoint.Y < -1f || newPoint.Y > (scene.RegionInfo.RegionSizeY) )
+            float newY = newPoint.Y;
+            if (newX < -1.0f || newX > (m_scene.RegionInfo.RegionSizeX + 1.0f) ||
+                newY < -1.0f || newY > (m_scene.RegionInfo.RegionSizeY + 1.0f) )
                return true;
-            SceneObjectPart obj = scene.GetSceneObjectPart(objectID);
+            if (sog == null)
-            if (obj == null)
                return false;
-            // Prim counts are determined by the location of the root prim.  if we're
+            ILandObject newParcel = m_scene.LandChannel.GetLandObject(newX, newY);
-            // moving a child prim, just let it pass
-            if (!obj.IsRoot)
-            {
-                return true;
-            }
-            ILandObject newParcel = scene.LandChannel.GetLandObject(newPoint.X, newPoint.Y);
            if (newParcel == null)
                return true;
-            Vector3 oldPoint = obj.GroupPosition;
+            if(!enteringRegion)
-            ILandObject oldParcel = scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y);
-            // The prim hasn't crossed a region boundry so we don't need to worry
-            // about prim counts here
-            if(oldParcel != null && oldParcel.Equals(newParcel))
            {
-                return true;
+                Vector3 oldPoint = sog.AbsolutePosition;
+                ILandObject oldParcel = m_scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y);
+                if(oldParcel != null && oldParcel.Equals(newParcel))
+                    return true;
            }
-            int objectCount = obj.ParentGroup.PrimCount;
+            int objectCount = sog.PrimCount;
-            int usedPrims = newParcel.PrimCounts.Total;
-            int simulatorCapacity = newParcel.GetSimulatorMaxPrimCount();
            // TODO: Add Special Case here for temporary prims
-            string response = DoCommonChecks(objectCount, obj.OwnerID, newParcel, scene);
+            string response = DoCommonChecks(objectCount, sog.OwnerID, newParcel);
            if (response != null)
            {
-                m_dialogModule.SendAlertToUser(obj.OwnerID, response);
+                if(m_dialogModule != null)
+                    m_dialogModule.SendAlertToUser(sog.OwnerID, response);
                return false;
            }
            return true;
        }
-        private string DoCommonChecks(int objectCount, UUID ownerID, ILandObject lo, Scene scene)
+        private string DoCommonChecks(int objectCount, UUID ownerID, ILandObject lo)
        {
            string response = null;
            int OwnedParcelsCapacity = lo.GetSimulatorMaxPrimCount();
            if ((objectCount + lo.PrimCounts.Total) > OwnedParcelsCapacity)
            {
-                response = "Unable to rez object because the parcel is too full";
+                response = "Unable to rez object because the parcel is full";
            }
            else
            {
-                int maxPrimsPerUser = scene.RegionInfo.MaxPrimsPerUser;
+                int maxPrimsPerUser = m_scene.RegionInfo.MaxPrimsPerUser;
                if (maxPrimsPerUser >= 0)
                {
                    // per-user prim limit is set
                    if (ownerID != lo.LandData.OwnerID || lo.LandData.IsGroupOwned)
                    {
                        // caller is not the sole Parcel owner
-                        EstateSettings estateSettings = scene.RegionInfo.EstateSettings;
+                        EstateSettings estateSettings = m_scene.RegionInfo.EstateSettings;
                        if (ownerID != estateSettings.EstateOwner)
                        {
                            // caller is NOT the Estate owner
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index a9fdb66..6cf0092 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -665,7 +665,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
            taskItem.AssetID = asset.FullID;
            host.Inventory.AddInventoryItem(taskItem, false);
+            host.ParentGroup.AggregatePerms();
            m_comms.DispatchReply(scriptID,1,assetID.ToString(),reqID.ToString());
        }
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index e22c6ea..b26fa32 100644
--- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -523,9 +523,9 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
            rootPart.AddFlag(PrimFlags.Phantom);
-            m_scene.AddNewSceneObject(sceneObject, true);
            sceneObject.SetGroup(groupID, null);
+            m_scene.AddNewSceneObject(sceneObject, true);
+            sceneObject.AggregatePerms();
            return sceneObject;
        }
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
index a2fbf41..45ef273 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
@@ -920,8 +920,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            }
            set
            {
+                float old = m_density;
                m_density = value / 100f;
-                // for not prim mass is not updated since this implies full rebuild of body inertia TODO
+                if(m_density != old)
+                    UpdatePrimBodyData();
            }
        }
        public override float GravModifier
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 9c67395..62654ee 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2735,7 +2735,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (part.ParentGroup.RootPart == part)
            {
                SceneObjectGroup parent = part.ParentGroup;
-                if (!parent.IsAttachment && !World.Permissions.CanObjectEntry(parent.UUID, false, (Vector3)toPos))
+                if (!parent.IsAttachment && !World.Permissions.CanObjectEntry(parent, false, (Vector3)toPos))
                    return;
                parent.UpdateGroupPosition((Vector3)toPos);
            }
@@ -7976,7 +7976,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer llScriptDanger(LSL_Vector pos)
        {
            m_host.AddScriptLPS(1);
-            bool result = World.ScriptDanger(m_host.LocalId, pos);
+            bool result = World.LSLScriptDanger(m_host, pos);
            if (result)
            {
                return 1;
@@ -7985,7 +7985,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            {
                return 0;
            }
        }
        public void llDialog(string avatar, string message, LSL_List buttons, int chat_channel)
@@ -15880,7 +15879,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                return;
            }
-            group.RootPart.AttachPoint = group.RootPart.Shape.State;
            group.RootPart.AttachedPos = group.AbsolutePosition;
            group.ResetIDs();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e769c6d..4c3f7ee 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2038,6 +2038,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                m_host.Inventory.AddInventoryItemExclusive(taskItem, false);
            else
                m_host.Inventory.AddInventoryItem(taskItem, false);
+            m_host.ParentGroup.AggregatePerms();
            return taskItem;
        }
@@ -3537,7 +3538,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            LSL_Float health = new LSL_Float(-1);
            ScenePresence presence = World.GetScenePresence(new UUID(avatar));
-            if (presence != null) health = presence.Health;
+            if (presence != null)
+                health = presence.Health;
            return health;
        }
@@ -3577,7 +3579,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            UUID avatarId = new UUID(avatar);
            ScenePresence presence = World.GetScenePresence(avatarId);
-            if (presence != null && World.ScriptDanger(m_host.LocalId, m_host.GetWorldPosition()))
+            if (presence != null)
            {
                float health = presence.Health;
                health += (float)healing;
@@ -3597,7 +3599,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            UUID avatarId = new UUID(avatar);
            ScenePresence presence = World.GetScenePresence(avatarId);
-            if (presence != null && World.ScriptDanger(m_host.LocalId, m_host.GetWorldPosition()))
+            if (presence != null)
            {
                if (health > 100.0)
                    health = 100.0;
@@ -3616,7 +3618,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            UUID avatarId = new UUID(avatar);
            ScenePresence presence = World.GetScenePresence(avatarId);
-            if (presence != null && World.ScriptDanger(m_host.LocalId, m_host.GetWorldPosition()))
+            if (presence != null)
                 presence.HealRate = (float)healrate;
        }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
index d652b0d1..16b87b3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
@@ -39,6 +39,7 @@ using OpenSim.Framework;
 using OpenSim.Region.CoreModules.Avatar.AvatarFactory;
 using OpenSim.Region.OptionalModules.World.NPC;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.CoreModules.World.Permissions;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.Api;
 using OpenSim.Region.ScriptEngine.Shared.Instance;
@@ -63,12 +64,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
            base.SetUp();
            IConfigSource initConfigSource = new IniConfigSource();
-            IConfig config = initConfigSource.AddConfig("XEngine");
+            IConfig config = initConfigSource.AddConfig("Startup");
+            config.Set("serverside_object_permissions", true);
+            config =initConfigSource.AddConfig("Permissions");
+            config.Set("permissionmodules", "DefaultPermissionsModule");
+            config.Set("serverside_object_permissions", true);
+            config.Set("propagate_permissions", true);
+            config = initConfigSource.AddConfig("XEngine");
            config.Set("Enabled", "true");
            m_scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(m_scene, initConfigSource);
+            SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new object[] { new DefaultPermissionsModule() });
            m_engine = new XEngine.XEngine();
            m_engine.Initialise(initConfigSource);
            m_engine.AddRegion(m_scene);