aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Tests/BasicRegionTest.cs
diff options
context:
space:
mode:
authorDr Scofield2008-11-14 10:55:14 +0000
committerDr Scofield2008-11-14 10:55:14 +0000
commit5e20e32b6993a79f8f31cb12882b9c4499140275 (patch)
tree8620c9dbaec8e4c973334511f5d3ebc98389a3d8 /OpenSim/Data/Tests/BasicRegionTest.cs
parentFrom: Alan Webb (alan_webb@us.ibm.com) (diff)
downloadopensim-SC-5e20e32b6993a79f8f31cb12882b9c4499140275.zip
opensim-SC-5e20e32b6993a79f8f31cb12882b9c4499140275.tar.gz
opensim-SC-5e20e32b6993a79f8f31cb12882b9c4499140275.tar.bz2
opensim-SC-5e20e32b6993a79f8f31cb12882b9c4499140275.tar.xz
From: Christopher Yeoh <cyeoh@au1.ibm.com>
This patch makes llAllowInventoryDrop work with the permissions module enabled. Changes include: - Enabled PropagatePermissions when permissions module serverside perms is on - change ownership of item when item is dropped into an object. Ownership changes to the owner of the object the item is dropped into - propagation of permissions if the permissions module enabled (eg next-owner mask applied) - CHANGED_ALLOWED_DROP is now passed to the change script event if an item was allowed to be dropped into the object only because llAllowInventoryDrop is enabled (instead of CHANGED_INVENTORY being passed). - Sets object flags correctly when llAllowInventoryDrop is called so clients are notified immediately of the change in state. Am not sure that calling aggregateScriptEvents is the right way to do it, but it works and seems to be the only way without making further changes to update LocalFlags
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index ab46ed4..ec64b77 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -591,7 +591,9 @@ namespace OpenSim.Data.Tests
591 Assert.That(t.ItemID,Is.EqualTo(id)); 591 Assert.That(t.ItemID,Is.EqualTo(id));
592 Assert.That(t.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID)); 592 Assert.That(t.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID));
593 Assert.That(t.NextPermissions, Is.EqualTo(nextperm)); 593 Assert.That(t.NextPermissions, Is.EqualTo(nextperm));
594 Assert.That(t.OwnerID,Is.EqualTo(owner)); 594 // Ownership changes when you drop an object into an object
595 // owned by someone else
596 Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID));
595 Assert.That(t.CurrentPermissions, Is.EqualTo(curperm)); 597 Assert.That(t.CurrentPermissions, Is.EqualTo(curperm));
596 Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID)); 598 Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID));
597 Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID)); 599 Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID));
@@ -848,4 +850,4 @@ namespace OpenSim.Data.Tests
848// return f; 850// return f;
849// } 851// }
850 } 852 }
851} \ No newline at end of file 853}