aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-14 15:48:34 +0000
committerJustin Clarke Casey2008-11-14 15:48:34 +0000
commit165fcd1aac4cf703384c4d8d062b7ce9795ef4b2 (patch)
tree9ce1375be9e8bb964ade1b29276587b2518209cc
parent* Hook up create new object event in the permissions module (diff)
downloadopensim-SC_OLD-165fcd1aac4cf703384c4d8d062b7ce9795ef4b2.zip
opensim-SC_OLD-165fcd1aac4cf703384c4d8d062b7ce9795ef4b2.tar.gz
opensim-SC_OLD-165fcd1aac4cf703384c4d8d062b7ce9795ef4b2.tar.bz2
opensim-SC_OLD-165fcd1aac4cf703384c4d8d062b7ce9795ef4b2.tar.xz
* Switch default permissions back to false (so they are not on) as they were two revisions ago, since it sounds like this was our agreed position from some time back
* Make the default also false (to match what is in OpenSim.ini.example)
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs6
-rw-r--r--bin/OpenSim.ini.example3
2 files changed, 3 insertions, 6 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.
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index b544be7..a19c4d2 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -113,7 +113,8 @@
113 ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy 113 ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
114 ; any item, etc. This may not yet be implemented uniformally. 114 ; any item, etc. This may not yet be implemented uniformally.
115 ; If set to true, then all permissions checks are carried out 115 ; If set to true, then all permissions checks are carried out
116 serverside_object_permissions = true 116 ; Default is false
117 serverside_object_permissions = false
117 118
118 allow_grid_gods = false 119 allow_grid_gods = false
119 120