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/EstateSettings.cs | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Add test TestGetChildPartPosition() (diff) | |
| download | opensim-SC_OLD-74aa8eee1255d457d0c865682a7c5466ae8d640e.zip opensim-SC_OLD-74aa8eee1255d457d0c865682a7c5466ae8d640e.tar.gz opensim-SC_OLD-74aa8eee1255d457d0c865682a7c5466ae8d640e.tar.bz2 opensim-SC_OLD-74aa8eee1255d457d0c865682a7c5466ae8d640e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Framework/EstateSettings.cs')
| -rw-r--r-- | OpenSim/Framework/EstateSettings.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index 142b783..1caf04a 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
| @@ -346,7 +346,7 @@ namespace OpenSim.Framework | |||
| 346 | l_EstateManagers.Remove(avatarID); | 346 | l_EstateManagers.Remove(avatarID); |
| 347 | } | 347 | } |
| 348 | 348 | ||
| 349 | public bool IsEstateManager(UUID avatarID) | 349 | public bool IsEstateManagerOrOwner(UUID avatarID) |
| 350 | { | 350 | { |
| 351 | if (IsEstateOwner(avatarID)) | 351 | if (IsEstateOwner(avatarID)) |
| 352 | return true; | 352 | return true; |
| @@ -411,7 +411,7 @@ namespace OpenSim.Framework | |||
| 411 | 411 | ||
| 412 | public bool HasAccess(UUID user) | 412 | public bool HasAccess(UUID user) |
| 413 | { | 413 | { |
| 414 | if (IsEstateManager(user)) | 414 | if (IsEstateManagerOrOwner(user)) |
| 415 | return true; | 415 | return true; |
| 416 | 416 | ||
| 417 | return l_EstateAccess.Contains(user); | 417 | return l_EstateAccess.Contains(user); |