ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of opensimulator.org:/var/git/opensim

Browse Source
This commit is contained in:
Melanie Thielker
2017-01-06 17:07:44 +00:00
parent e526e8c5e2 0b912b2acc
commit 8ab7e047bf
3 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@@ -99,7 +99,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
private bool m_allowGridGods = false;
private bool m_RegionOwnerIsGod = false;
private bool m_RegionManagerIsGod = false;
private bool m_ParcelOwnerIsGod = false;
private bool m_SimpleBuildPermissions = false;
@@ -178,8 +177,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
new string[] { "Startup", "Permissions" }, true);
m_RegionManagerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_manager_is_god",
new string[] { "Startup", "Permissions" }, false);
m_ParcelOwnerIsGod = Util.GetConfigVarFromSections<bool>(config, "parcel_owner_is_god",
new string[] { "Startup", "Permissions" }, false);
m_SimpleBuildPermissions = Util.GetConfigVarFromSections<bool>(config, "simple_build_permissions",
new string[] { "Startup", "Permissions" }, false);
@@ -718,6 +715,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (IsAdministrator(user))
return PermissionClass.Owner;
/* to review later
// Users should be able to edit what is over their land.
Vector3 taskPos = obj.AbsolutePosition;
ILandObject parcel = m_scene.LandChannel.GetLandObject(taskPos.X, taskPos.Y);
@@ -727,7 +725,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (!IsAdministrator(objectOwner))
return PermissionClass.Owner;
}
*/
// Group permissions
if ((obj.GroupID != UUID.Zero) && IsGroupMember(obj.GroupID, user, 0))
return PermissionClass.Group;

13
OpenSim/Region/Framework/Scenes/GodController.cs
View File

@@ -53,7 +53,6 @@ namespace OpenSim.Region.Framework.Scenes
protected bool m_forceGridGodsOnly;
protected bool m_regionOwnerIsGod;
protected bool m_regionManagerIsGod;
protected bool m_parcelOwnerIsGod;
protected bool m_forceGodModeAlwaysOn;
protected bool m_allowGodActionsWithoutGodMode;
@@ -94,10 +93,6 @@ namespace OpenSim.Region.Framework.Scenes
Util.GetConfigVarFromSections<bool>(config,
"region_manager_is_god", sections, false);
// Parcel owners are gods in their own parcels only.
m_parcelOwnerIsGod =
Util.GetConfigVarFromSections<bool>(config,
"parcel_owner_is_god", sections, false);
}
else
m_allowGridGods = true; // reduce user mistakes increased by this over complex options set
@@ -140,14 +135,6 @@ namespace OpenSim.Region.Framework.Scenes
if (m_regionManagerIsGod && m_scene.Permissions.IsEstateManager(m_scenePresence.UUID))
return true;
if (m_parcelOwnerIsGod) // Skip expensive check if we're already god!
{
Vector3 pos = m_scenePresence.AbsolutePosition;
ILandObject parcel = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
if (parcel != null && parcel.LandData.OwnerID == m_scenePresence.UUID)
return true;
}
return false;
}