diff options
| author | Melanie Thielker | 2008-08-16 05:41:40 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-08-16 05:41:40 +0000 |
| commit | 682ffef10169f92a28b42987e6ba47c70de41b8a (patch) | |
| tree | 923da3e075567e704d152d9fc0485821943a5739 /OpenSim/Region | |
| parent | Guard against the null UUID being queried from the userserver (diff) | |
| download | opensim-SC_OLD-682ffef10169f92a28b42987e6ba47c70de41b8a.zip opensim-SC_OLD-682ffef10169f92a28b42987e6ba47c70de41b8a.tar.gz opensim-SC_OLD-682ffef10169f92a28b42987e6ba47c70de41b8a.tar.bz2 opensim-SC_OLD-682ffef10169f92a28b42987e6ba47c70de41b8a.tar.xz | |
Reshuffle to eliminate prim owner lookups unless gridgods are enabled
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 10f4897..b3da36c 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
| @@ -246,11 +246,14 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
| 246 | if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) | 246 | if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) |
| 247 | return true; | 247 | return true; |
| 248 | } | 248 | } |
| 249 | CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(user); | 249 | if(m_allowGridGods) |
| 250 | if(profile != null && profile.UserProfile != null) | ||
| 251 | { | 250 | { |
| 252 | if(profile.UserProfile.GodLevel >= 200 && m_allowGridGods) | 251 | CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(user); |
| 253 | return true; | 252 | if(profile != null && profile.UserProfile != null) |
| 253 | { | ||
| 254 | if(profile.UserProfile.GodLevel >= 200) | ||
| 255 | return true; | ||
| 256 | } | ||
| 254 | } | 257 | } |
| 255 | 258 | ||
| 256 | return false; | 259 | return false; |