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/Region/CoreModules/World/Permissions | |
| 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/Region/CoreModules/World/Permissions')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 82ccaf8..881b24a 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -503,7 +503,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 503 | { | 503 | { |
| 504 | if (user == UUID.Zero) return false; | 504 | if (user == UUID.Zero) return false; |
| 505 | 505 | ||
| 506 | return m_scene.RegionInfo.EstateSettings.IsEstateManager(user); | 506 | return m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(user); |
| 507 | } | 507 | } |
| 508 | 508 | ||
| 509 | #endregion | 509 | #endregion |