diff options
| author | Melanie | 2011-01-27 02:29:10 +0100 |
|---|---|---|
| committer | Melanie | 2011-01-27 02:29:10 +0100 |
| commit | 3321f9d745ea782667b664365f23be75a2b047f5 (patch) | |
| tree | ccb46a08ca26868049d269ecd68eac5bd94867da /OpenSim/Framework/Tests | |
| parent | Make bans work for teleport. Now teleport will complete block if the user (diff) | |
| parent | Mostly revert the last commit with the aim of searching for a better solution (diff) | |
| download | opensim-SC-3321f9d745ea782667b664365f23be75a2b047f5.zip opensim-SC-3321f9d745ea782667b664365f23be75a2b047f5.tar.gz opensim-SC-3321f9d745ea782667b664365f23be75a2b047f5.tar.bz2 opensim-SC-3321f9d745ea782667b664365f23be75a2b047f5.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Tests')
| -rw-r--r-- | OpenSim/Framework/Tests/MundaneFrameworkTests.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs index e7f8bfc..e131260 100644 --- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs +++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs | |||
| @@ -217,12 +217,12 @@ namespace OpenSim.Framework.Tests | |||
| 217 | BannedHostNameMask = string.Empty, | 217 | BannedHostNameMask = string.Empty, |
| 218 | BannedUserID = bannedUserId} | 218 | BannedUserID = bannedUserId} |
| 219 | ); | 219 | ); |
| 220 | Assert.IsTrue(es.IsBanned(bannedUserId), "User Should be banned but is not."); | 220 | Assert.IsTrue(es.IsBanned(bannedUserId, 32), "User Should be banned but is not."); |
| 221 | Assert.IsFalse(es.IsBanned(UUID.Zero), "User Should not be banned but is."); | 221 | Assert.IsFalse(es.IsBanned(UUID.Zero, 32), "User Should not be banned but is."); |
| 222 | 222 | ||
| 223 | es.RemoveBan(bannedUserId); | 223 | es.RemoveBan(bannedUserId); |
| 224 | 224 | ||
| 225 | Assert.IsFalse(es.IsBanned(bannedUserId), "User Should not be banned but is."); | 225 | Assert.IsFalse(es.IsBanned(bannedUserId, 32), "User Should not be banned but is."); |
| 226 | 226 | ||
| 227 | es.AddEstateManager(UUID.Zero); | 227 | es.AddEstateManager(UUID.Zero); |
| 228 | 228 | ||