aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie2010-03-09 23:10:14 +0000
committerMelanie2010-03-09 23:11:28 +0000
commit88771aeed3d45e60a18aa9a810eeb37b8e5def12 (patch)
tree6e914b1dde29b032d683915efebbc2d1787d9880 /OpenSim/Region/CoreModules
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-88771aeed3d45e60a18aa9a810eeb37b8e5def12.zip
opensim-SC-88771aeed3d45e60a18aa9a810eeb37b8e5def12.tar.gz
opensim-SC-88771aeed3d45e60a18aa9a810eeb37b8e5def12.tar.bz2
opensim-SC-88771aeed3d45e60a18aa9a810eeb37b8e5def12.tar.xz
Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
to use that stored value.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 2211f3e..845c4c2 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -490,6 +490,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions
490 490
491 if (m_allowGridGods) 491 if (m_allowGridGods)
492 { 492 {
493 ScenePresence sp = m_scene.GetScenePresence(user);
494 if (sp != null)
495 {
496 if (sp.UserLevel >= 200)
497 return true;
498 return false;
499 }
500
493 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, user); 501 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, user);
494 if (account != null) 502 if (account != null)
495 { 503 {