aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-08-07 08:01:59 -0700
committerDiva Canto2013-08-07 08:01:59 -0700
commit3194ffdab8d54723ad1546846c1d45472d6a8464 (patch)
tree22ff7b24fc86a86e12bae5d2da526c36eebf344c
parentAdd "debug comms status" command to show current debug comms settings (diff)
downloadopensim-SC_OLD-3194ffdab8d54723ad1546846c1d45472d6a8464.zip
opensim-SC_OLD-3194ffdab8d54723ad1546846c1d45472d6a8464.tar.gz
opensim-SC_OLD-3194ffdab8d54723ad1546846c1d45472d6a8464.tar.bz2
opensim-SC_OLD-3194ffdab8d54723ad1546846c1d45472d6a8464.tar.xz
Fixed incomplete commit r/23317 -- see_into_region. Put the guard around estate bans also, and delete the obsolete config var.
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs32
-rw-r--r--OpenSim/Tools/Configger/ConfigurationLoader.cs1
3 files changed, 16 insertions, 18 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index fc3999f..3e93638 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -337,7 +337,6 @@ namespace OpenSim
337 config.Set("physics", "OpenDynamicsEngine"); 337 config.Set("physics", "OpenDynamicsEngine");
338 config.Set("meshing", "Meshmerizer"); 338 config.Set("meshing", "Meshmerizer");
339 config.Set("physical_prim", true); 339 config.Set("physical_prim", true);
340 config.Set("see_into_this_sim_from_neighbor", true);
341 config.Set("serverside_object_permissions", true); 340 config.Set("serverside_object_permissions", true);
342 config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); 341 config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
343 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); 342 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index dec493b..503b81a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4013,28 +4013,28 @@ namespace OpenSim.Region.Framework.Scenes
4013 } 4013 }
4014 } 4014 }
4015 4015
4016 if (RegionInfo.EstateSettings != null)
4017 {
4018 if (RegionInfo.EstateSettings.IsBanned(agent.AgentID))
4019 {
4020 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
4021 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
4022 reason = String.Format("Denied access to region {0}: You have been banned from that region.",
4023 RegionInfo.RegionName);
4024 return false;
4025 }
4026 }
4027 else
4028 {
4029 m_log.ErrorFormat("[CONNECTION BEGIN]: Estate Settings is null!");
4030 }
4031
4032 // We only test the things below when we want to cut off 4016 // We only test the things below when we want to cut off
4033 // child agents from being present in the scene for which their root 4017 // child agents from being present in the scene for which their root
4034 // agent isn't allowed. Otherwise, we allow child agents. The test for 4018 // agent isn't allowed. Otherwise, we allow child agents. The test for
4035 // the root is done elsewhere (QueryAccess) 4019 // the root is done elsewhere (QueryAccess)
4036 if (!bypassAccessControl) 4020 if (!bypassAccessControl)
4037 { 4021 {
4022 if (RegionInfo.EstateSettings != null)
4023 {
4024 if (RegionInfo.EstateSettings.IsBanned(agent.AgentID))
4025 {
4026 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
4027 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
4028 reason = String.Format("Denied access to region {0}: You have been banned from that region.",
4029 RegionInfo.RegionName);
4030 return false;
4031 }
4032 }
4033 else
4034 {
4035 m_log.ErrorFormat("[CONNECTION BEGIN]: Estate Settings is null!");
4036 }
4037
4038 List<UUID> agentGroups = new List<UUID>(); 4038 List<UUID> agentGroups = new List<UUID>();
4039 4039
4040 if (m_groupsModule != null) 4040 if (m_groupsModule != null)
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index 28bcc99..72ba185 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -239,7 +239,6 @@ namespace OpenSim.Tools.Configger
239 config.Set("physics", "OpenDynamicsEngine"); 239 config.Set("physics", "OpenDynamicsEngine");
240 config.Set("meshing", "Meshmerizer"); 240 config.Set("meshing", "Meshmerizer");
241 config.Set("physical_prim", true); 241 config.Set("physical_prim", true);
242 config.Set("see_into_this_sim_from_neighbor", true);
243 config.Set("serverside_object_permissions", true); 242 config.Set("serverside_object_permissions", true);
244 config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); 243 config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
245 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); 244 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");