Merge branch 'master' of opensimulator.org:/var/git/opensim

10 files changed, 1020 insertions, 7 deletions

diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index fbd7e90..7902fb1 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -626,6 +626,7 @@ namespace OpenSim.Tests.Common
             //part.ObjectFlags |= (uint)PrimFlags.Phantom;
 
             scene.AddNewSceneObject(so, true);
+            so.InvalidateDeepEffectivePerms();
 
             return so;
         }
@@ -652,6 +653,7 @@ namespace OpenSim.Tests.Common
             SceneObjectGroup so = CreateSceneObject(parts, ownerId, partNamePrefix, uuidTail);
 
             scene.AddNewSceneObject(so, false);
+            so.InvalidateDeepEffectivePerms();
 
             return so;
         }
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index e2f57b5..449716b 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -760,7 +760,11 @@ namespace OpenSim.Tests.Common
         {
         }
 
-        public void SendAvatarDataImmediate(ISceneEntity avatar)
+        public void SendEntityFullUpdateImmediate(ISceneEntity ent)
+        {
+        }
+
+        public void SendEntityTerseUpdateImmediate(ISceneEntity ent)
         {
         }
 
@@ -1311,6 +1315,10 @@ namespace OpenSim.Tests.Common
         {
         }
 
+        public void SendEmpytMuteList()
+        {
+        }
+
         public void SendMuteListUpdate(string filename)
         {
         }
diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
index 3e00d82..f2ce064 100644
--- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
+++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
@@ -108,12 +108,12 @@ namespace OpenSim.Tests.Common
             AddEvent(avatarID, "Enqueue", o);
             return true;
         }
-
+/*
         public void DisableSimulator(ulong handle, UUID avatarID)
         {
             AddEvent(avatarID, "DisableSimulator", handle);
         }
-
+*/
         public void EnableSimulator (ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
         {
             AddEvent(avatarID, "EnableSimulator", handle);
diff --git a/OpenSim/Tests/Common/Mock/TestGroupsDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestGroupsDataPlugin.cs
new file mode 100644
index 0000000..8e2d8e6
--- /dev/null
+++ b/OpenSim/Tests/Common/Mock/TestGroupsDataPlugin.cs
@@ -0,0 +1,339 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using OpenMetaverse;
+using OpenSim.Data;
+
+namespace OpenSim.Tests.Common.Mock
+{
+    public class TestGroupsDataPlugin : IGroupsData
+    {
+        class CompositeKey
+        {
+            private readonly string _key;
+            public string Key
+            {
+                get { return _key;  }
+            }
+
+            public CompositeKey(UUID _k1, string _k2)
+            {
+                _key = _k1.ToString() + _k2;
+            }
+
+            public CompositeKey(UUID _k1, string _k2, string _k3)
+            {
+                _key = _k1.ToString() + _k2 + _k3;
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (obj is CompositeKey)
+                {
+                    return Key == ((CompositeKey)obj).Key;
+                }
+                return false;
+            }
+
+            public override int GetHashCode()
+            {
+                return base.GetHashCode();
+            }
+
+            public override string ToString()
+            {
+                return Key;
+            }
+        }
+
+        private Dictionary<UUID, GroupData> m_Groups;
+        private Dictionary<CompositeKey, MembershipData> m_Membership;
+        private Dictionary<CompositeKey, RoleData> m_Roles;
+        private Dictionary<CompositeKey, RoleMembershipData> m_RoleMembership;
+        private Dictionary<UUID, InvitationData> m_Invites;
+        private Dictionary<UUID, NoticeData> m_Notices;
+        private Dictionary<string, PrincipalData> m_Principals;
+
+        public TestGroupsDataPlugin(string connectionString, string realm)
+        {
+            m_Groups = new Dictionary<UUID, GroupData>();
+            m_Membership = new Dictionary<CompositeKey, MembershipData>();
+            m_Roles = new Dictionary<CompositeKey, RoleData>();
+            m_RoleMembership = new Dictionary<CompositeKey, RoleMembershipData>();
+            m_Invites = new Dictionary<UUID, InvitationData>();
+            m_Notices = new Dictionary<UUID, NoticeData>();
+            m_Principals = new Dictionary<string, PrincipalData>();
+        }
+
+        #region groups table
+        public bool StoreGroup(GroupData data)
+        {
+            return false;
+        }
+
+        public GroupData RetrieveGroup(UUID groupID)
+        {
+            if (m_Groups.ContainsKey(groupID))
+                return m_Groups[groupID];
+
+            return null;
+        }
+
+        public GroupData RetrieveGroup(string name)
+        {
+            return m_Groups.Values.First(g => g.Data.ContainsKey("Name") && g.Data["Name"] == name);
+        }
+
+        public GroupData[] RetrieveGroups(string pattern)
+        {
+            if (string.IsNullOrEmpty(pattern))
+                pattern = "1";
+
+            IEnumerable<GroupData> groups = m_Groups.Values.Where(g => g.Data.ContainsKey("Name") && (g.Data["Name"].StartsWith(pattern) || g.Data["Name"].EndsWith(pattern)));
+
+            return (groups != null) ? groups.ToArray() : new GroupData[0];
+        }
+
+        public bool DeleteGroup(UUID groupID)
+        {
+            return m_Groups.Remove(groupID);
+        }
+
+        public int GroupsCount()
+        {
+            return m_Groups.Count;
+        }
+        #endregion
+
+        #region membership table
+        public MembershipData RetrieveMember(UUID groupID, string pricipalID)
+        {
+            CompositeKey dkey = new CompositeKey(groupID, pricipalID);
+            if (m_Membership.ContainsKey(dkey))
+                return m_Membership[dkey];
+
+            return null;
+        }
+
+        public MembershipData[] RetrieveMembers(UUID groupID)
+        {
+            IEnumerable<CompositeKey> keys = m_Membership.Keys.Where(k => k.Key.StartsWith(groupID.ToString()));
+            return keys.Where(m_Membership.ContainsKey).Select(x => m_Membership[x]).ToArray();
+        }
+
+        public MembershipData[] RetrieveMemberships(string principalID)
+        {
+            IEnumerable<CompositeKey> keys = m_Membership.Keys.Where(k => k.Key.EndsWith(principalID.ToString()));
+            return keys.Where(m_Membership.ContainsKey).Select(x => m_Membership[x]).ToArray();
+        }
+
+        public MembershipData[] RetrievePrincipalGroupMemberships(string principalID)
+        {
+            return RetrieveMemberships(principalID);
+        }
+
+        public MembershipData RetrievePrincipalGroupMembership(string principalID, UUID groupID)
+        {
+            CompositeKey dkey = new CompositeKey(groupID, principalID);
+            if (m_Membership.ContainsKey(dkey))
+                return m_Membership[dkey];
+            return null;
+        }
+
+        public bool StoreMember(MembershipData data)
+        {
+            CompositeKey dkey = new CompositeKey(data.GroupID, data.PrincipalID);
+            m_Membership[dkey] = data;
+            return true;
+        }
+
+        public bool DeleteMember(UUID groupID, string principalID)
+        {
+            CompositeKey dkey = new CompositeKey(groupID, principalID);
+            if (m_Membership.ContainsKey(dkey))
+                return m_Membership.Remove(dkey);
+
+            return false;
+        }
+
+        public int MemberCount(UUID groupID)
+        {
+            return m_Membership.Count;
+        }
+        #endregion
+
+        #region roles table
+        public bool StoreRole(RoleData data)
+        {
+            CompositeKey dkey = new CompositeKey(data.GroupID, data.RoleID.ToString());
+            m_Roles[dkey] = data;
+            return true;
+        }
+
+        public RoleData RetrieveRole(UUID groupID, UUID roleID)
+        {
+            CompositeKey dkey = new CompositeKey(groupID, roleID.ToString());
+            if (m_Roles.ContainsKey(dkey))
+                return m_Roles[dkey];
+
+            return null;
+        }
+
+        public RoleData[] RetrieveRoles(UUID groupID)
+        {
+            IEnumerable<CompositeKey> keys = m_Roles.Keys.Where(k => k.Key.StartsWith(groupID.ToString()));
+            return keys.Where(m_Roles.ContainsKey).Select(x => m_Roles[x]).ToArray();
+        }
+
+        public bool DeleteRole(UUID groupID, UUID roleID)
+        {
+            CompositeKey dkey = new CompositeKey(groupID, roleID.ToString());
+            if (m_Roles.ContainsKey(dkey))
+                return m_Roles.Remove(dkey);
+
+            return false;
+        }
+
+        public int RoleCount(UUID groupID)
+        {
+            return m_Roles.Count;
+        }
+        #endregion
+
+        #region rolememberhip table
+        public RoleMembershipData[] RetrieveRolesMembers(UUID groupID)
+        {
+            IEnumerable<CompositeKey> keys = m_Roles.Keys.Where(k => k.Key.StartsWith(groupID.ToString()));
+            return keys.Where(m_RoleMembership.ContainsKey).Select(x => m_RoleMembership[x]).ToArray();
+        }
+
+        public RoleMembershipData[] RetrieveRoleMembers(UUID groupID, UUID roleID)
+        {
+            IEnumerable<CompositeKey> keys = m_Roles.Keys.Where(k => k.Key.StartsWith(groupID.ToString() + roleID.ToString()));
+            return keys.Where(m_RoleMembership.ContainsKey).Select(x => m_RoleMembership[x]).ToArray();
+        }
+
+        public RoleMembershipData[] RetrieveMemberRoles(UUID groupID, string principalID)
+        {
+            IEnumerable<CompositeKey> keys = m_Roles.Keys.Where(k => k.Key.StartsWith(groupID.ToString()) && k.Key.EndsWith(principalID));
+            return keys.Where(m_RoleMembership.ContainsKey).Select(x => m_RoleMembership[x]).ToArray();
+        }
+
+        public RoleMembershipData RetrieveRoleMember(UUID groupID, UUID roleID, string principalID)
+        {
+            CompositeKey dkey = new CompositeKey(groupID, roleID.ToString(), principalID);
+            if (m_RoleMembership.ContainsKey(dkey))
+                return m_RoleMembership[dkey];
+
+            return null;
+        }
+
+        public int RoleMemberCount(UUID groupID, UUID roleID)
+        {
+            return m_RoleMembership.Count;
+        }
+
+        public bool StoreRoleMember(RoleMembershipData data)
+        {
+            CompositeKey dkey = new CompositeKey(data.GroupID, data.RoleID.ToString(), data.PrincipalID);
+            m_RoleMembership[dkey] = data;
+            return true;
+        }
+
+        public bool DeleteRoleMember(RoleMembershipData data)
+        {
+            CompositeKey dkey = new CompositeKey(data.GroupID, data.RoleID.ToString(), data.PrincipalID);
+            if (m_RoleMembership.ContainsKey(dkey))
+                return m_RoleMembership.Remove(dkey);
+
+            return false;
+        }
+
+        public bool DeleteMemberAllRoles(UUID groupID, string principalID)
+        {
+            List<CompositeKey> keys = m_RoleMembership.Keys.Where(k => k.Key.StartsWith(groupID.ToString()) && k.Key.EndsWith(principalID)).ToList();
+            foreach (CompositeKey k in keys)
+                m_RoleMembership.Remove(k);
+            return true;
+        }
+        #endregion
+
+        #region principals table
+        public bool StorePrincipal(PrincipalData data)
+        {
+            m_Principals[data.PrincipalID] = data;
+            return true;
+        }
+
+        public PrincipalData RetrievePrincipal(string principalID)
+        {
+            if (m_Principals.ContainsKey(principalID))
+                return m_Principals[principalID];
+
+            return null;
+        }
+
+        public bool DeletePrincipal(string principalID)
+        {
+            if (m_Principals.ContainsKey(principalID))
+                return m_Principals.Remove(principalID);
+            return false;
+        }
+        #endregion
+
+        #region invites table
+        public bool StoreInvitation(InvitationData data)
+        {
+            return false;
+        }
+
+        public InvitationData RetrieveInvitation(UUID inviteID)
+        {
+            return null;
+        }
+
+        public InvitationData RetrieveInvitation(UUID groupID, string principalID)
+        {
+            return null;
+        }
+
+        public bool DeleteInvite(UUID inviteID)
+        {
+            return false;
+        }
+
+        public void DeleteOldInvites()
+        {
+        }
+        #endregion
+
+        #region notices table
+        public bool StoreNotice(NoticeData data)
+        {
+            return false;
+        }
+
+        public NoticeData RetrieveNotice(UUID noticeID)
+        {
+            return null;
+        }
+
+        public NoticeData[] RetrieveNotices(UUID groupID)
+        {
+            return new NoticeData[0];
+        }
+
+        public bool DeleteNotice(UUID noticeID)
+        {
+            return false;
+        }
+
+        public void DeleteOldNotices()
+        {
+        }
+        #endregion
+
+    }
+}
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index 3d44a33..cb16f55 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -42,6 +42,8 @@ namespace OpenSim.Tests.Common
         private Scene m_scene;
         private List<ILandObject> m_parcels;
 
+        public float BanLineSafeHeight { get { return 100f; } }
+
         public TestLandChannel(Scene scene)
         {
             m_scene = scene;
@@ -96,6 +98,11 @@ namespace OpenSim.Tests.Common
             return GetNoLand();
         }
 
+        public ILandObject GetLandObject(UUID ID)
+        {
+            return GetNoLand();
+        }
+
         public ILandObject GetLandObject(float x, float y)
         {
             return GetNoLand();
@@ -104,6 +111,7 @@ namespace OpenSim.Tests.Common
         public bool IsLandPrimCountTainted() { return false; }
         public bool IsForcefulBansAllowed() { return false; }
         public void UpdateLandObject(int localID, LandData data) {}
+        public void SendParcelsOverlay(IClientAPI client) {}
         public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient) {}
         public void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel) {}
         public void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel) {}
diff --git a/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs b/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs
index 2e17f1e..4577ca3 100644
--- a/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs
+++ b/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs
@@ -117,8 +117,6 @@ namespace OpenSim.Tests.Common
         /// </summary>
         public string StatusDescription { get; set; }
 
-        public bool ReuseContext { get; set; }
-
         /// <summary>
         /// Add a header field and content to the response.
         /// </summary>
diff --git a/OpenSim/Tests/Permissions/Common.cs b/OpenSim/Tests/Permissions/Common.cs
new file mode 100644
index 0000000..4ecce38
--- /dev/null
+++ b/OpenSim/Tests/Permissions/Common.cs
@@ -0,0 +1,374 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.CoreModules.World.Permissions;
+using OpenSim.Region.CoreModules.Avatar.Inventory.Transfer;
+using OpenSim.Region.CoreModules.Framework.InventoryAccess;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+using PermissionMask = OpenSim.Framework.PermissionMask;
+
+namespace OpenSim.Tests.Permissions
+{
+    [SetUpFixture]
+    public class Common : OpenSimTestCase
+    {
+        public static Common TheInstance;
+
+        public static TestScene TheScene
+        {
+            get { return TheInstance.m_Scene; }
+        }
+
+        public static ScenePresence[] TheAvatars
+        {
+            get { return TheInstance.m_Avatars;  }
+        }
+
+        private static string Perms = "Owner: {0}; Group: {1}; Everyone: {2}; Next: {3}";
+        private TestScene m_Scene;
+        private ScenePresence[] m_Avatars = new ScenePresence[3];
+
+        [SetUp]
+        public override void SetUp()
+        {
+            if (TheInstance == null)
+                TheInstance = this;
+
+            base.SetUp();
+            TestHelpers.EnableLogging();
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Messaging");
+            config.Configs["Messaging"].Set("InventoryTransferModule", "InventoryTransferModule");
+
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
+
+            config.AddConfig("InventoryService");
+            config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:XInventoryService");
+            config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll:TestXInventoryDataPlugin");
+
+            config.AddConfig("Groups");
+            config.Configs["Groups"].Set("Enabled", "true");
+            config.Configs["Groups"].Set("Module", "Groups Module V2");
+            config.Configs["Groups"].Set("StorageProvider", "OpenSim.Tests.Common.dll:TestGroupsDataPlugin");
+            config.Configs["Groups"].Set("ServicesConnectorModule", "Groups Local Service Connector");
+            config.Configs["Groups"].Set("LocalService", "local");
+
+            m_Scene = new SceneHelpers().SetupScene("Test", UUID.Random(), 1000, 1000, config);
+            // Add modules
+            SceneHelpers.SetupSceneModules(m_Scene, config, new DefaultPermissionsModule(), new InventoryTransferModule(), new BasicInventoryAccessModule());
+
+            SetUpBasicEnvironment();
+        }
+
+        /// <summary>
+        /// The basic environment consists of:
+        /// - 3 avatars: A1, A2, A3
+        /// - 6 simple boxes inworld belonging to A0 and with Next Owner perms:
+        ///   C, CT, MC, MCT, MT, T
+        /// - Copies of all of these boxes in A0's inventory in the Objects folder
+        /// - One additional box inworld and in A0's inventory which is a copy of MCT, but 
+        ///   with C removed in inventory. This one is called MCT-C
+        /// </summary>
+        private void SetUpBasicEnvironment()
+        {
+            Console.WriteLine("===> SetUpBasicEnvironment <===");
+
+            // Add 3 avatars
+            for (int i = 0; i < 3; i++)
+            {
+                UUID id = TestHelpers.ParseTail(i + 1);
+
+                m_Avatars[i] = AddScenePresence("Bot", "Bot_" + (i+1), id);
+                Assert.That(m_Avatars[i], Is.Not.Null);
+                Assert.That(m_Avatars[i].IsChildAgent, Is.False);
+                Assert.That(m_Avatars[i].UUID, Is.EqualTo(id));
+                Assert.That(m_Scene.GetScenePresences().Count, Is.EqualTo(i + 1));
+            }
+
+            AddA1Object("Box C", 10, PermissionMask.Copy);
+            AddA1Object("Box CT", 11, PermissionMask.Copy | PermissionMask.Transfer);
+            AddA1Object("Box MC", 12, PermissionMask.Modify | PermissionMask.Copy);
+            AddA1Object("Box MCT", 13, PermissionMask.Modify | PermissionMask.Copy | PermissionMask.Transfer);
+            AddA1Object("Box MT", 14, PermissionMask.Modify | PermissionMask.Transfer);
+            AddA1Object("Box T", 15, PermissionMask.Transfer);
+
+            // MCT-C
+            AddA1Object("Box MCT-C", 16, PermissionMask.Modify | PermissionMask.Copy | PermissionMask.Transfer);
+
+            Thread.Sleep(5000);
+
+            InventoryFolderBase objsFolder = UserInventoryHelpers.GetInventoryFolder(m_Scene.InventoryService, m_Avatars[0].UUID, "Objects");
+            List<InventoryItemBase> items = m_Scene.InventoryService.GetFolderItems(m_Avatars[0].UUID, objsFolder.ID);
+            Assert.That(items.Count, Is.EqualTo(7));
+
+            RevokePermission(0, "Box MCT-C", PermissionMask.Copy);
+        }
+
+        private ScenePresence AddScenePresence(string first, string last, UUID id)
+        {
+            UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(m_Scene, first, last, id, "pw");
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_Scene, id);
+            Assert.That(m_Scene.AuthenticateHandler.GetAgentCircuitData(id), Is.Not.Null);
+
+            return sp;
+        }
+
+        private void AddA1Object(string name, int suffix, PermissionMask nextOwnerPerms)
+        {
+            // Create a Box. Default permissions are just T
+            SceneObjectGroup box = AddSceneObject(name, suffix, 1, m_Avatars[0].UUID);
+            Assert.True((box.RootPart.NextOwnerMask & (int)PermissionMask.Copy) == 0);
+            Assert.True((box.RootPart.NextOwnerMask & (int)PermissionMask.Modify) == 0);
+            Assert.True((box.RootPart.NextOwnerMask & (int)PermissionMask.Transfer) != 0);
+
+            // field = 16 is NextOwner 
+            // set = 1 means add the permission; set = 0 means remove permission
+
+            if ((nextOwnerPerms & PermissionMask.Copy) != 0)
+                m_Scene.HandleObjectPermissionsUpdate((IClientAPI)m_Avatars[0].ClientView, m_Avatars[0].UUID,
+                    ((IClientAPI)(m_Avatars[0].ClientView)).SessionId, 16, box.LocalId, (uint)PermissionMask.Copy, 1);
+
+            if ((nextOwnerPerms & PermissionMask.Modify) != 0)
+                m_Scene.HandleObjectPermissionsUpdate((IClientAPI)m_Avatars[0].ClientView, m_Avatars[0].UUID,
+                    ((IClientAPI)(m_Avatars[0].ClientView)).SessionId, 16, box.LocalId, (uint)PermissionMask.Modify, 1);
+
+            if ((nextOwnerPerms & PermissionMask.Transfer) == 0)
+                m_Scene.HandleObjectPermissionsUpdate((IClientAPI)m_Avatars[0].ClientView, m_Avatars[0].UUID,
+                    ((IClientAPI)(m_Avatars[0].ClientView)).SessionId, 16, box.LocalId, (uint)PermissionMask.Transfer, 0);
+
+            PrintPerms(box);
+            AssertPermissions(nextOwnerPerms, (PermissionMask)box.RootPart.NextOwnerMask, box.OwnerID.ToString().Substring(34) + " : " + box.Name);
+
+            TakeCopyToInventory(0, box);
+
+        }
+
+        public void RevokePermission(int ownerIndex, string name, PermissionMask perm)
+        {
+            InventoryItemBase item = Common.TheInstance.GetItemFromInventory(m_Avatars[ownerIndex].UUID, "Objects", name);
+            Assert.That(item, Is.Not.Null);
+
+            // Clone it, so to avoid aliasing -- just like the viewer does.
+            InventoryItemBase clone = Common.TheInstance.CloneInventoryItem(item);
+            // Revoke the permission in this copy
+            clone.NextPermissions &= ~(uint)perm;
+            Common.TheInstance.AssertPermissions((PermissionMask)clone.NextPermissions & ~perm,
+                (PermissionMask)clone.NextPermissions, Common.TheInstance.IdStr(clone));
+            Assert.That(clone.ID == item.ID);
+
+            // Update properties of the item in inventory. This should affect the original item above.
+            Common.TheScene.UpdateInventoryItemAsset(m_Avatars[ownerIndex].ControllingClient, UUID.Zero, clone.ID, clone);
+
+            item = Common.TheInstance.GetItemFromInventory(m_Avatars[ownerIndex].UUID, "Objects", name);
+            Assert.That(item, Is.Not.Null);
+            Common.TheInstance.PrintPerms(item);
+            Common.TheInstance.AssertPermissions((PermissionMask)item.NextPermissions & ~perm,
+                (PermissionMask)item.NextPermissions, Common.TheInstance.IdStr(item));
+
+        }
+
+        public void PrintPerms(SceneObjectGroup sog)
+        {
+            Console.WriteLine("SOG " + sog.Name + " (" + sog.OwnerID.ToString().Substring(34) + "): " + 
+                String.Format(Perms, (PermissionMask)sog.EffectiveOwnerPerms,
+                    (PermissionMask)sog.EffectiveGroupPerms, (PermissionMask)sog.EffectiveEveryOnePerms, (PermissionMask)sog.RootPart.NextOwnerMask));
+
+        }
+
+        public void PrintPerms(InventoryItemBase item)
+        {
+            Console.WriteLine("Inv " + item.Name + " (" + item.Owner.ToString().Substring(34) + "): " + 
+                String.Format(Perms, (PermissionMask)item.BasePermissions,
+                    (PermissionMask)item.GroupPermissions, (PermissionMask)item.EveryOnePermissions, (PermissionMask)item.NextPermissions));
+
+        }
+
+        public void AssertPermissions(PermissionMask desired, PermissionMask actual, string message)
+        {
+            if ((desired & PermissionMask.Copy) != 0)
+                Assert.True((actual & PermissionMask.Copy) != 0, message);
+            else
+                Assert.True((actual & PermissionMask.Copy) == 0, message);
+
+            if ((desired & PermissionMask.Modify) != 0)
+                Assert.True((actual & PermissionMask.Modify) != 0, message);
+            else
+                Assert.True((actual & PermissionMask.Modify) == 0, message);
+
+            if ((desired & PermissionMask.Transfer) != 0)
+                Assert.True((actual & PermissionMask.Transfer) != 0, message);
+            else
+                Assert.True((actual & PermissionMask.Transfer) == 0, message);
+
+        }
+
+        public SceneObjectGroup AddSceneObject(string name, int suffix, int partsToTestCount, UUID ownerID)
+        {
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(partsToTestCount, ownerID, name, suffix);
+            so.Name = name;
+            so.Description = name;
+
+            Assert.That(m_Scene.AddNewSceneObject(so, false), Is.True);
+            SceneObjectGroup retrievedSo = m_Scene.GetSceneObjectGroup(so.UUID);
+
+            // If the parts have the same UUID then we will consider them as one and the same
+            Assert.That(retrievedSo.PrimCount, Is.EqualTo(partsToTestCount));
+
+            return so;
+        }
+
+        public void TakeCopyToInventory(int userIndex, SceneObjectGroup sog)
+        {
+            InventoryFolderBase objsFolder = UserInventoryHelpers.GetInventoryFolder(m_Scene.InventoryService, m_Avatars[userIndex].UUID, "Objects");
+            Assert.That(objsFolder, Is.Not.Null);
+
+            List<uint> localIds = new List<uint>(); localIds.Add(sog.LocalId);
+            // This is an async operation
+            m_Scene.DeRezObjects((IClientAPI)m_Avatars[userIndex].ClientView, localIds, m_Avatars[userIndex].UUID, DeRezAction.TakeCopy, objsFolder.ID);
+        }
+
+        public InventoryItemBase GetItemFromInventory(UUID userID, string folderName, string itemName)
+        {
+            InventoryFolderBase objsFolder = UserInventoryHelpers.GetInventoryFolder(m_Scene.InventoryService, userID, folderName);
+            Assert.That(objsFolder, Is.Not.Null);
+            List<InventoryItemBase> items = m_Scene.InventoryService.GetFolderItems(userID, objsFolder.ID);
+            InventoryItemBase item = items.Find(i => i.Name == itemName);
+            Assert.That(item, Is.Not.Null);
+
+            return item;
+        }
+
+        public InventoryItemBase CloneInventoryItem(InventoryItemBase item)
+        {
+            InventoryItemBase clone = new InventoryItemBase(item.ID);
+            clone.Name = item.Name;
+            clone.Description = item.Description;
+            clone.AssetID = item.AssetID;
+            clone.AssetType = item.AssetType;
+            clone.BasePermissions = item.BasePermissions;
+            clone.CreatorId = item.CreatorId;
+            clone.CurrentPermissions = item.CurrentPermissions;
+            clone.EveryOnePermissions = item.EveryOnePermissions;
+            clone.Flags = item.Flags;
+            clone.Folder = item.Folder;
+            clone.GroupID = item.GroupID;
+            clone.GroupOwned = item.GroupOwned;
+            clone.GroupPermissions = item.GroupPermissions;
+            clone.InvType = item.InvType;
+            clone.NextPermissions = item.NextPermissions;
+            clone.Owner = item.Owner;
+
+            return clone;
+        }
+
+        public void DeleteObjectsFolders()
+        {
+            // Delete everything in A2 and A3's Objects folders, so we can restart
+            for (int i = 1; i < 3; i++)
+            {
+                InventoryFolderBase objsFolder = UserInventoryHelpers.GetInventoryFolder(Common.TheScene.InventoryService, Common.TheAvatars[i].UUID, "Objects");
+                Assert.That(objsFolder, Is.Not.Null);
+
+                List<InventoryItemBase> items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[i].UUID, objsFolder.ID);
+                List<UUID> ids = new List<UUID>();
+                foreach (InventoryItemBase it in items)
+                    ids.Add(it.ID);
+
+                Common.TheScene.InventoryService.DeleteItems(Common.TheAvatars[i].UUID, ids);
+                items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[i].UUID, objsFolder.ID);
+                Assert.That(items.Count, Is.EqualTo(0), "A" + (i + 1));
+            }
+
+        }
+
+        public string IdStr(InventoryItemBase item)
+        {
+            return item.Owner.ToString().Substring(34) + " : " + item.Name;
+        }
+
+        public string IdStr(SceneObjectGroup sog)
+        {
+            return sog.OwnerID.ToString().Substring(34) + " : " + sog.Name;
+        }
+
+        public void GiveInventoryItem(UUID itemId, ScenePresence giverSp, ScenePresence receiverSp)
+        {
+            TestClient giverClient = (TestClient)giverSp.ControllingClient;
+            TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
+
+            UUID initialSessionId = TestHelpers.ParseTail(0x10);
+            byte[] giveImBinaryBucket = new byte[17];
+            byte[] itemIdBytes = itemId.GetBytes();
+            Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
+
+            GridInstantMessage giveIm
+                = new GridInstantMessage(
+                    m_Scene,
+                    giverSp.UUID,
+                    giverSp.Name,
+                    receiverSp.UUID,
+                    (byte)InstantMessageDialog.InventoryOffered,
+                    false,
+                    "inventory offered msg",
+                    initialSessionId,
+                    false,
+                    Vector3.Zero,
+                    giveImBinaryBucket,
+                    true);
+
+            giverClient.HandleImprovedInstantMessage(giveIm);
+
+            // These details might not all be correct.
+            GridInstantMessage acceptIm
+                = new GridInstantMessage(
+                    m_Scene,
+                    receiverSp.UUID,
+                    receiverSp.Name,
+                    giverSp.UUID,
+                    (byte)InstantMessageDialog.InventoryAccepted,
+                    false,
+                    "inventory accepted msg",
+                    initialSessionId,
+                    false,
+                    Vector3.Zero,
+                    null,
+                    true);
+
+            receiverClient.HandleImprovedInstantMessage(acceptIm);
+        }
+    }
+}
diff --git a/OpenSim/Tests/Permissions/DirectTransferTests.cs b/OpenSim/Tests/Permissions/DirectTransferTests.cs
new file mode 100644
index 0000000..0f251db
--- /dev/null
+++ b/OpenSim/Tests/Permissions/DirectTransferTests.cs
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using PermissionMask = OpenSim.Framework.PermissionMask;
+
+namespace OpenSim.Tests.Permissions
+{
+    /// <summary>
+    /// Basic scene object tests (create, read and delete but not update).
+    /// </summary>
+    [TestFixture]
+    public class DirectTransferTests
+    {
+
+        [SetUp]
+        public void SetUp()
+        {
+            // In case we're dealing with some older version of nunit
+            if (Common.TheInstance == null)
+            {
+                Common.TheInstance = new Common();
+                Common.TheInstance.SetUp();
+            }
+
+            Common.TheInstance.DeleteObjectsFolders();
+        }
+
+        /// <summary>
+        /// Test giving simple objecta with various combinations of next owner perms.
+        /// </summary>
+        [Test]
+        public void TestGiveBox()
+        {
+            TestHelpers.InMethod();
+
+            // C, CT, MC, MCT, MT, T
+            string[] names = new string[6] { "Box C", "Box CT", "Box MC", "Box MCT", "Box MT", "Box T" };
+            PermissionMask[] perms = new PermissionMask[6] {
+                    PermissionMask.Copy,
+                    PermissionMask.Copy | PermissionMask.Transfer,
+                    PermissionMask.Modify | PermissionMask.Copy,
+                    PermissionMask.Modify | PermissionMask.Copy | PermissionMask.Transfer,
+                    PermissionMask.Modify | PermissionMask.Transfer,
+                    PermissionMask.Transfer
+            };
+
+            for (int i = 0; i < 6; i++)
+                TestOneBox(names[i], perms[i]);
+        }
+
+        private void TestOneBox(string name, PermissionMask mask)
+        {
+            InventoryItemBase item = Common.TheInstance.GetItemFromInventory(Common.TheAvatars[0].UUID, "Objects", name);
+
+            Common.TheInstance.GiveInventoryItem(item.ID, Common.TheAvatars[0], Common.TheAvatars[1]);
+
+            item = Common.TheInstance.GetItemFromInventory(Common.TheAvatars[1].UUID, "Objects", name);
+
+            // Check the receiver
+            Common.TheInstance.PrintPerms(item);
+            Common.TheInstance.AssertPermissions(mask, (PermissionMask)item.BasePermissions, item.Owner.ToString().Substring(34) + " : " + item.Name);
+
+            int nObjects = Common.TheScene.GetSceneObjectGroups().Count;
+            // Rez it and check perms in scene too
+            Common.TheScene.RezObject(Common.TheAvatars[1].ControllingClient, item.ID, UUID.Zero, Vector3.One, Vector3.Zero, UUID.Zero, 0, false, false, false, UUID.Zero);
+            Assert.That(Common.TheScene.GetSceneObjectGroups().Count, Is.EqualTo(nObjects + 1));
+
+            SceneObjectGroup box = Common.TheScene.GetSceneObjectGroups().Find(sog => sog.OwnerID == Common.TheAvatars[1].UUID && sog.Name == name);
+            Common.TheInstance.PrintPerms(box);
+            Assert.That(box, Is.Not.Null);
+
+            // Check Owner permissions
+            Common.TheInstance.AssertPermissions(mask, (PermissionMask)box.EffectiveOwnerPerms, box.OwnerID.ToString().Substring(34) + " : " + box.Name);
+
+            // Check Next Owner permissions
+            Common.TheInstance.AssertPermissions(mask, (PermissionMask)box.RootPart.NextOwnerMask, box.OwnerID.ToString().Substring(34) + " : " + box.Name);
+
+        }
+
+        /// <summary>
+        /// Test giving simple objecta with variour combinations of next owner perms.
+        /// </summary>
+        [Test]
+        public void TestDoubleGiveWithChange()
+        {
+            TestHelpers.InMethod();
+
+            string name = "Box MCT-C";
+            InventoryItemBase item = Common.TheInstance.GetItemFromInventory(Common.TheAvatars[0].UUID, "Objects", name);
+
+            // Now give the item to A2. We give the original item, not a clone. 
+            // The giving methods are supposed to duplicate it.
+            Common.TheInstance.GiveInventoryItem(item.ID, Common.TheAvatars[0], Common.TheAvatars[1]);
+
+            item = Common.TheInstance.GetItemFromInventory(Common.TheAvatars[1].UUID, "Objects", name);
+
+            // Check the receiver
+            Common.TheInstance.PrintPerms(item);
+            Common.TheInstance.AssertPermissions(PermissionMask.Modify | PermissionMask.Transfer,
+                (PermissionMask)item.BasePermissions, Common.TheInstance.IdStr(item));
+
+            // ---------------------------
+            // Second transfer
+            //----------------------------
+
+            // A2 revokes M
+            Common.TheInstance.RevokePermission(1, name, PermissionMask.Modify);
+
+            item = Common.TheInstance.GetItemFromInventory(Common.TheAvatars[1].UUID, "Objects", name);
+
+            // Now give the item to A3. We give the original item, not a clone. 
+            // The giving methods are supposed to duplicate it.
+            Common.TheInstance.GiveInventoryItem(item.ID, Common.TheAvatars[1], Common.TheAvatars[2]);
+
+            item = Common.TheInstance.GetItemFromInventory(Common.TheAvatars[2].UUID, "Objects", name);
+
+            // Check the receiver
+            Common.TheInstance.PrintPerms(item);
+            Common.TheInstance.AssertPermissions(PermissionMask.Transfer,
+                (PermissionMask)item.BasePermissions, Common.TheInstance.IdStr(item));
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs
new file mode 100644
index 0000000..fb96b8b
--- /dev/null
+++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Collections.Generic;
+using System.Threading;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using PermissionMask = OpenSim.Framework.PermissionMask;
+
+namespace OpenSim.Tests.Permissions
+{
+    /// <summary>
+    /// Basic scene object tests (create, read and delete but not update).
+    /// </summary>
+    [TestFixture]
+    public class IndirectTransferTests
+    {
+
+        [SetUp]
+        public void SetUp()
+        {
+            // In case we're dealing with some older version of nunit
+            if (Common.TheInstance == null)
+            {
+                Common.TheInstance = new Common();
+                Common.TheInstance.SetUp();
+            }
+            Common.TheInstance.DeleteObjectsFolders();
+        }
+
+        /// <summary>
+        /// Test giving simple objecta with various combinations of next owner perms.
+        /// </summary>
+        [Test]
+        public void SimpleTakeCopy()
+        {
+            TestHelpers.InMethod();
+
+            // The Objects folder of A2
+            InventoryFolderBase objsFolder = UserInventoryHelpers.GetInventoryFolder(Common.TheScene.InventoryService, Common.TheAvatars[1].UUID, "Objects");
+
+            // C, CT, MC, MCT, MT, T
+            string[] names = new string[6] { "Box C", "Box CT", "Box MC", "Box MCT", "Box MT", "Box T" };
+            PermissionMask[] perms = new PermissionMask[6] {
+                    PermissionMask.Copy,
+                    PermissionMask.Copy | PermissionMask.Transfer,
+                    PermissionMask.Modify | PermissionMask.Copy,
+                    PermissionMask.Modify | PermissionMask.Copy | PermissionMask.Transfer,
+                    PermissionMask.Modify | PermissionMask.Transfer,
+                    PermissionMask.Transfer
+            };
+
+            // Try A2 takes copies of objects that cannot be copied. 
+            for (int i = 0; i < 6; i++)
+                TakeOneBox(Common.TheScene.GetSceneObjectGroups(), names[i], perms[i]);
+            // Ad-hoc. Enough time to let the take work.
+            Thread.Sleep(5000);
+
+            List<InventoryItemBase> items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[1].UUID, objsFolder.ID);
+            Assert.That(items.Count, Is.EqualTo(0));
+
+            // A1 makes the objects copyable
+            for (int i = 0; i < 6; i++)
+                MakeCopyable(Common.TheScene.GetSceneObjectGroups(), names[i]);
+
+            // Try A2 takes copies of objects that can be copied. 
+            for (int i = 0; i < 6; i++)
+                TakeOneBox(Common.TheScene.GetSceneObjectGroups(), names[i], perms[i]);
+            // Ad-hoc. Enough time to let the take work.
+            Thread.Sleep(5000);
+
+            items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[1].UUID, objsFolder.ID);
+            Assert.That(items.Count, Is.EqualTo(6));
+
+            for (int i = 0; i < 6; i++)
+            {
+                InventoryItemBase item = Common.TheInstance.GetItemFromInventory(Common.TheAvatars[1].UUID, "Objects", names[i]);
+                Assert.That(item, Is.Not.Null);
+                Common.TheInstance.AssertPermissions(perms[i], (PermissionMask)item.BasePermissions, Common.TheInstance.IdStr(item));
+            }
+        }
+
+        private void TakeOneBox(List<SceneObjectGroup> objs, string name, PermissionMask mask)
+        {
+            // Find the object inworld
+            SceneObjectGroup box = objs.Find(sog => sog.Name == name && sog.OwnerID == Common.TheAvatars[0].UUID);
+            Assert.That(box, Is.Not.Null, name);
+
+            // A2's inventory (index 1)
+            Common.TheInstance.TakeCopyToInventory(1, box);
+        }
+
+        private void MakeCopyable(List<SceneObjectGroup> objs, string name)
+        {
+            SceneObjectGroup box = objs.Find(sog => sog.Name == name && sog.OwnerID == Common.TheAvatars[0].UUID);
+            Assert.That(box, Is.Not.Null, name);
+
+            // field = 8 is Everyone 
+            // set = 1 means add the permission; set = 0 means remove permission
+            Common.TheScene.HandleObjectPermissionsUpdate((IClientAPI)Common.TheAvatars[0].ClientView, Common.TheAvatars[0].UUID,
+                Common.TheAvatars[0].ControllingClient.SessionId, 8, box.LocalId, (uint)PermissionMask.Copy, 1);
+            Common.TheInstance.PrintPerms(box);
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs b/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs
index 5e6a638..e9767f3 100644
--- a/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs
+++ b/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs
@@ -118,8 +118,7 @@ namespace OpenSim.Tests.Stress
                         so.UUID,
                         m_tests.Vrm.GetContentType(),
                         string.Format("PenColour BLACK; MoveTo 40,220; FontSize 32; Text {0};", text),
-                        "",
-                        0);
+                        "");
 
                     Assert.That(originalTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));