diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 02d0e02..bdf314f 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -99,7 +99,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
99 | private bool m_allowGridGods = false; | 99 | private bool m_allowGridGods = false; |
100 | private bool m_RegionOwnerIsGod = false; | 100 | private bool m_RegionOwnerIsGod = false; |
101 | private bool m_RegionManagerIsGod = false; | 101 | private bool m_RegionManagerIsGod = false; |
102 | private bool m_ParcelOwnerIsGod = false; | ||
103 | 102 | ||
104 | private bool m_SimpleBuildPermissions = false; | 103 | private bool m_SimpleBuildPermissions = false; |
105 | 104 | ||
@@ -178,8 +177,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
178 | new string[] { "Startup", "Permissions" }, true); | 177 | new string[] { "Startup", "Permissions" }, true); |
179 | m_RegionManagerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_manager_is_god", | 178 | m_RegionManagerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_manager_is_god", |
180 | new string[] { "Startup", "Permissions" }, false); | 179 | new string[] { "Startup", "Permissions" }, false); |
181 | m_ParcelOwnerIsGod = Util.GetConfigVarFromSections<bool>(config, "parcel_owner_is_god", | ||
182 | new string[] { "Startup", "Permissions" }, false); | ||
183 | 180 | ||
184 | m_SimpleBuildPermissions = Util.GetConfigVarFromSections<bool>(config, "simple_build_permissions", | 181 | m_SimpleBuildPermissions = Util.GetConfigVarFromSections<bool>(config, "simple_build_permissions", |
185 | new string[] { "Startup", "Permissions" }, false); | 182 | new string[] { "Startup", "Permissions" }, false); |
@@ -718,6 +715,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
718 | if (IsAdministrator(user)) | 715 | if (IsAdministrator(user)) |
719 | return PermissionClass.Owner; | 716 | return PermissionClass.Owner; |
720 | 717 | ||
718 | /* to review later | ||
721 | // Users should be able to edit what is over their land. | 719 | // Users should be able to edit what is over their land. |
722 | Vector3 taskPos = obj.AbsolutePosition; | 720 | Vector3 taskPos = obj.AbsolutePosition; |
723 | ILandObject parcel = m_scene.LandChannel.GetLandObject(taskPos.X, taskPos.Y); | 721 | ILandObject parcel = m_scene.LandChannel.GetLandObject(taskPos.X, taskPos.Y); |
@@ -727,7 +725,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
727 | if (!IsAdministrator(objectOwner)) | 725 | if (!IsAdministrator(objectOwner)) |
728 | return PermissionClass.Owner; | 726 | return PermissionClass.Owner; |
729 | } | 727 | } |
730 | 728 | */ | |
731 | // Group permissions | 729 | // Group permissions |
732 | if ((obj.GroupID != UUID.Zero) && IsGroupMember(obj.GroupID, user, 0)) | 730 | if ((obj.GroupID != UUID.Zero) && IsGroupMember(obj.GroupID, user, 0)) |
733 | return PermissionClass.Group; | 731 | return PermissionClass.Group; |