diff options
| author | Melanie Thielker | 2008-11-14 17:53:58 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-14 17:53:58 +0000 |
| commit | 9960637545f8b79bc38dbb341e99eaf48720c1e0 (patch) | |
| tree | 96aed844bf79a07a9a77871ccda69ea90cfb25d8 | |
| parent | Reapplying a revised version of Christopher Yeoh's (IBM) patch for allow (diff) | |
| download | opensim-SC-9960637545f8b79bc38dbb341e99eaf48720c1e0.zip opensim-SC-9960637545f8b79bc38dbb341e99eaf48720c1e0.tar.gz opensim-SC-9960637545f8b79bc38dbb341e99eaf48720c1e0.tar.bz2 opensim-SC-9960637545f8b79bc38dbb341e99eaf48720c1e0.tar.xz | |
Try to make the test pass again
| -rw-r--r-- | OpenSim/Data/Tests/BasicRegionTest.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs index ec64b77..a280af3 100644 --- a/OpenSim/Data/Tests/BasicRegionTest.cs +++ b/OpenSim/Data/Tests/BasicRegionTest.cs | |||
| @@ -594,7 +594,7 @@ namespace OpenSim.Data.Tests | |||
| 594 | // Ownership changes when you drop an object into an object | 594 | // Ownership changes when you drop an object into an object |
| 595 | // owned by someone else | 595 | // owned by someone else |
| 596 | Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID)); | 596 | Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID)); |
| 597 | Assert.That(t.CurrentPermissions, Is.EqualTo(curperm)); | 597 | Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 8)); |
| 598 | Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID)); | 598 | Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID)); |
| 599 | Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID)); | 599 | Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID)); |
| 600 | } | 600 | } |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs index 2b560f4..225f7cf 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | |||
| @@ -185,7 +185,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 185 | bool addFromAllowedDrop = false; | 185 | bool addFromAllowedDrop = false; |
| 186 | if (remoteClient!=null) | 186 | if (remoteClient!=null) |
| 187 | { | 187 | { |
| 188 | addFromAllowedDrop = remoteClient.AgentId!=part.OwnerID; | 188 | addFromAllowedDrop = remoteClient.AgentId != part.OwnerID; |
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | part.AddInventoryItem(taskItem, addFromAllowedDrop); | 191 | part.AddInventoryItem(taskItem, addFromAllowedDrop); |