forceGridAdminsOnly and forceGridGodsOnly is no longer needed
This commit is contained in:
@@ -89,7 +89,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
|
||||
private bool m_propagatePermissions = false;
|
||||
private bool m_debugPermissions = false;
|
||||
private bool m_allowGridAdmins = false;
|
||||
private bool m_forceGridAdminsOnly;
|
||||
private bool m_forceAdminModeAlwaysOn;
|
||||
private bool m_allowAdminActionsWithoutGodMode;
|
||||
private bool m_takeCopyRestricted = false;
|
||||
@@ -163,8 +162,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
|
||||
m_bypassPermissions = !Util.GetConfigVarFromSections<bool>(config, "serverside_object_permissions", sections, true);
|
||||
m_propagatePermissions = Util.GetConfigVarFromSections<bool>(config, "propagate_permissions", sections, true);
|
||||
|
||||
m_forceGridAdminsOnly = Util.GetConfigVarFromSections<bool>(config, "force_grid_gods_only", sections, true);
|
||||
|
||||
m_forceAdminModeAlwaysOn = Util.GetConfigVarFromSections<bool>(config, "automatic_gods", sections, false);
|
||||
m_allowAdminActionsWithoutGodMode = Util.GetConfigVarFromSections<bool>(config, "implicit_gods", sections, false);
|
||||
if(m_allowAdminActionsWithoutGodMode)
|
||||
|
||||
@@ -46,7 +46,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
ScenePresence m_scenePresence;
|
||||
Scene m_scene;
|
||||
protected bool m_allowGridGods;
|
||||
protected bool m_forceGridGodsOnly;
|
||||
protected bool m_forceGodModeAlwaysOn;
|
||||
protected bool m_allowGodActionsWithoutGodMode;
|
||||
|
||||
@@ -76,11 +75,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
Util.GetConfigVarFromSections<bool>(config,
|
||||
"allow_grid_gods", sections, true);
|
||||
|
||||
// If grid gods are active, dont allow any other gods
|
||||
m_forceGridGodsOnly =
|
||||
Util.GetConfigVarFromSections<bool>(config,
|
||||
"force_grid_gods_only", sections, true);
|
||||
|
||||
// God mode should be turned on in the viewer whenever
|
||||
// the user has god rights somewhere. They may choose
|
||||
// to turn it off again, though.
|
||||
|
||||
Reference in New Issue
Block a user