ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove parcel_owner_is_god option. It is conceptually wrong and with

Browse Source 
limited use. Relevant parcel owners can just be made estate managers with better regions management logic
This commit is contained in:
UbitUmarov
2017-01-06 14:48:49 +00:00
parent c707955517
commit 0b912b2acc
3 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
}