diff options
| author | Melanie | 2010-07-14 19:53:15 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-14 19:53:15 +0100 |
| commit | 0b74662ce2e0d0afebf977b71c34b5246b81b8f9 (patch) | |
| tree | 4fd2b4437e7a0621f3ddad4986a31d9dc328b4ee /OpenSim/Data | |
| parent | Major attachments cleanup. Remove unused AttachObject ClientView method (diff) | |
| parent | Major attachments cleanup. Remove unused AttachObject ClientView method (diff) | |
| download | opensim-SC-0b74662ce2e0d0afebf977b71c34b5246b81b8f9.zip opensim-SC-0b74662ce2e0d0afebf977b71c34b5246b81b8f9.tar.gz opensim-SC-0b74662ce2e0d0afebf977b71c34b5246b81b8f9.tar.bz2 opensim-SC-0b74662ce2e0d0afebf977b71c34b5246b81b8f9.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/Tests/RegionTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs index 2506678..eeffdda 100644 --- a/OpenSim/Data/Tests/RegionTests.cs +++ b/OpenSim/Data/Tests/RegionTests.cs | |||
| @@ -781,7 +781,7 @@ namespace OpenSim.Data.Tests | |||
| 781 | // Ownership changes when you drop an object into an object | 781 | // Ownership changes when you drop an object into an object |
| 782 | // owned by someone else | 782 | // owned by someone else |
| 783 | Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID), "Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID))"); | 783 | Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID), "Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID))"); |
| 784 | Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 16), "Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 8))"); | 784 | // Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 16), "Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 8))"); |
| 785 | Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID), "Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID))"); | 785 | Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID), "Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID))"); |
| 786 | Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID), "Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID))"); | 786 | Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID), "Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID))"); |
| 787 | } | 787 | } |