From ff429a259b41f1205a6b153bb6da383d9a9f5daf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 23 May 2012 01:58:10 +0100
Subject: Fix bug where an avatar that had an object they owned attached
through llAttachToAvatar() or osForceAttachToAvatar() would wrongly have next
permissions come into play when they detached that object and rezzed it in
scene.
This is because the attachments module code was setting the 'object slam' bit by using PermissionMask.All
Solution here is to route the attachment item creation call through the existing inventory code in BasicInventoryAccessModule rather than copy/pasted code in AttachmentsModule itself.
---
OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Tests')
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 59829d9..239afc0 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -566,7 +566,7 @@ namespace OpenSim.Tests.Common
///
public static SceneObjectPart AddSceneObject(Scene scene)
{
- return AddSceneObject(scene, "Test Object");
+ return AddSceneObject(scene, "Test Object", UUID.Zero);
}
///
@@ -574,10 +574,11 @@ namespace OpenSim.Tests.Common
///
///
///
+ ///
///
- public static SceneObjectPart AddSceneObject(Scene scene, string name)
+ public static SceneObjectPart AddSceneObject(Scene scene, string name, UUID ownerId)
{
- SceneObjectPart part = CreateSceneObjectPart(name, UUID.Random(), UUID.Zero);
+ SceneObjectPart part = CreateSceneObjectPart(name, UUID.Random(), ownerId);
//part.UpdatePrimFlags(false, false, true);
//part.ObjectFlags |= (uint)PrimFlags.Phantom;
--
cgit v1.1