diff options
| author | Melanie | 2012-04-17 01:54:54 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-17 01:54:54 +0100 |
| commit | 74aa8eee1255d457d0c865682a7c5466ae8d640e (patch) | |
| tree | d7fed81841ad48e09836ee3582b7161921339f9e /OpenSim/Framework/Tests | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Add test TestGetChildPartPosition() (diff) | |
| download | opensim-SC-74aa8eee1255d457d0c865682a7c5466ae8d640e.zip opensim-SC-74aa8eee1255d457d0c865682a7c5466ae8d640e.tar.gz opensim-SC-74aa8eee1255d457d0c865682a7c5466ae8d640e.tar.bz2 opensim-SC-74aa8eee1255d457d0c865682a7c5466ae8d640e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Framework/Tests')
| -rw-r--r-- | OpenSim/Framework/Tests/MundaneFrameworkTests.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs index 34a3f15..6fde488 100644 --- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs +++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs | |||
| @@ -227,10 +227,10 @@ namespace OpenSim.Framework.Tests | |||
| 227 | es.AddEstateManager(UUID.Zero); | 227 | es.AddEstateManager(UUID.Zero); |
| 228 | 228 | ||
| 229 | es.AddEstateManager(bannedUserId); | 229 | es.AddEstateManager(bannedUserId); |
| 230 | Assert.IsTrue(es.IsEstateManager(bannedUserId), "bannedUserId should be EstateManager but isn't."); | 230 | Assert.IsTrue(es.IsEstateManagerOrOwner(bannedUserId), "bannedUserId should be EstateManager but isn't."); |
| 231 | 231 | ||
| 232 | es.RemoveEstateManager(bannedUserId); | 232 | es.RemoveEstateManager(bannedUserId); |
| 233 | Assert.IsFalse(es.IsEstateManager(bannedUserId), "bannedUserID is estateManager but shouldn't be"); | 233 | Assert.IsFalse(es.IsEstateManagerOrOwner(bannedUserId), "bannedUserID is estateManager but shouldn't be"); |
| 234 | 234 | ||
| 235 | Assert.IsFalse(es.HasAccess(bannedUserId), "bannedUserID has access but shouldn't"); | 235 | Assert.IsFalse(es.HasAccess(bannedUserId), "bannedUserID has access but shouldn't"); |
| 236 | 236 | ||