diff options
| author | Kitto Flora | 2010-07-13 20:37:45 +0000 |
|---|---|---|
| committer | Kitto Flora | 2010-07-13 20:37:45 +0000 |
| commit | 84227fd55852391dae6f2e162c4b0a852ee24f13 (patch) | |
| tree | f3472e0268397366fdf6096bf4e925f9002d24dd /OpenSim/Data | |
| parent | Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes oc... (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-84227fd55852391dae6f2e162c4b0a852ee24f13.zip opensim-SC-84227fd55852391dae6f2e162c4b0a852ee24f13.tar.gz opensim-SC-84227fd55852391dae6f2e162c4b0a852ee24f13.tar.bz2 opensim-SC-84227fd55852391dae6f2e162c4b0a852ee24f13.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -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 1f654d3..2506678 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 | 8), "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 | } |