OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed incomplete commit r/23317 -- see_into_region. Put the guard around estate bans also, and delete the obsolete config var.

TeleportWork
Diva Canto 2013-08-07 08:01:59 -07:00
parent 4581bdd929
commit 3194ffdab8
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@ -337,7 +337,6 @@ namespace OpenSim
config.Set("physics", "OpenDynamicsEngine"); config.Set("physics", "OpenDynamicsEngine");
config.Set("meshing", "Meshmerizer"); config.Set("meshing", "Meshmerizer");
config.Set("physical_prim", true); config.Set("physical_prim", true);
config.Set("see_into_this_sim_from_neighbor", true);
config.Set("serverside_object_permissions", true); config.Set("serverside_object_permissions", true);
config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");

32
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -4013,28 +4013,28 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
if (RegionInfo.EstateSettings != null)
{
if (RegionInfo.EstateSettings.IsBanned(agent.AgentID))
{
m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
reason = String.Format("Denied access to region {0}: You have been banned from that region.",
RegionInfo.RegionName);
return false;
}
}
else
{
m_log.ErrorFormat("[CONNECTION BEGIN]: Estate Settings is null!");
}
// We only test the things below when we want to cut off // We only test the things below when we want to cut off
// child agents from being present in the scene for which their root // child agents from being present in the scene for which their root
// agent isn't allowed. Otherwise, we allow child agents. The test for // agent isn't allowed. Otherwise, we allow child agents. The test for
// the root is done elsewhere (QueryAccess) // the root is done elsewhere (QueryAccess)
if (!bypassAccessControl) if (!bypassAccessControl)
{ {
if (RegionInfo.EstateSettings != null)
{
if (RegionInfo.EstateSettings.IsBanned(agent.AgentID))
{
m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
reason = String.Format("Denied access to region {0}: You have been banned from that region.",
RegionInfo.RegionName);
return false;
}
}
else
{
m_log.ErrorFormat("[CONNECTION BEGIN]: Estate Settings is null!");
}
List<UUID> agentGroups = new List<UUID>(); List<UUID> agentGroups = new List<UUID>();
if (m_groupsModule != null) if (m_groupsModule != null)

1
OpenSim/Tools/Configger/ConfigurationLoader.cs
View File

@ -239,7 +239,6 @@ namespace OpenSim.Tools.Configger
config.Set("physics", "OpenDynamicsEngine"); config.Set("physics", "OpenDynamicsEngine");
config.Set("meshing", "Meshmerizer"); config.Set("meshing", "Meshmerizer");
config.Set("physical_prim", true); config.Set("physical_prim", true);
config.Set("see_into_this_sim_from_neighbor", true);
config.Set("serverside_object_permissions", true); config.Set("serverside_object_permissions", true);
config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");