aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs6
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index fe6256f..28e9850 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
62 #region Bypass Permissions / Debug Permissions Stuff 62 #region Bypass Permissions / Debug Permissions Stuff
63 63
64 // Bypasses the permissions engine 64 // Bypasses the permissions engine
65 private bool m_bypassPermissions = false; 65 private bool m_bypassPermissions = true;
66 private bool m_bypassPermissionsValue = true; 66 private bool m_bypassPermissionsValue = true;
67 private bool m_debugPermissions = false; 67 private bool m_debugPermissions = false;
68 private bool m_allowGridGods = false; 68 private bool m_allowGridGods = false;
@@ -372,8 +372,6 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
372 if (IsEstateManager(user) && m_RegionOwnerIsGod) 372 if (IsEstateManager(user) && m_RegionOwnerIsGod)
373 return objectOwnerMask; 373 return objectOwnerMask;
374 374
375
376
377 // Admin should be able to edit anything in the sim (including admin objects) 375 // Admin should be able to edit anything in the sim (including admin objects)
378 if (IsAdministrator(user)) 376 if (IsAdministrator(user))
379 return objectOwnerMask; 377 return objectOwnerMask;
@@ -823,13 +821,11 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
823 return false; 821 return false;
824 } 822 }
825 823
826
827 SceneObjectGroup group = (SceneObjectGroup)m_scene.Entities[objectID]; 824 SceneObjectGroup group = (SceneObjectGroup)m_scene.Entities[objectID];
828 825
829 UUID objectOwner = group.OwnerID; 826 UUID objectOwner = group.OwnerID;
830 locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0); 827 locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0);
831 828
832
833 // This is an exception to the generic object permission. 829 // This is an exception to the generic object permission.
834 // Administrators who lock their objects should not be able to move them, 830 // Administrators who lock their objects should not be able to move them,
835 // however generic object permission should return true. 831 // however generic object permission should return true.