aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7295a38..5876da9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -538,7 +538,7 @@ namespace OpenSim.Region.Framework.Scenes
538 SceneCommunicationService sceneGridService, 538 SceneCommunicationService sceneGridService,
539 ISimulationDataService simDataService, IEstateDataService estateDataService, 539 ISimulationDataService simDataService, IEstateDataService estateDataService,
540 ModuleLoader moduleLoader, bool dumpAssetsToFile, 540 ModuleLoader moduleLoader, bool dumpAssetsToFile,
541 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 541 IConfigSource config, string simulatorVersion)
542 : this(regInfo) 542 : this(regInfo)
543 { 543 {
544 m_config = config; 544 m_config = config;
@@ -554,8 +554,6 @@ namespace OpenSim.Region.Framework.Scenes
554 m_EstateDataService = estateDataService; 554 m_EstateDataService = estateDataService;
555 m_regionHandle = m_regInfo.RegionHandle; 555 m_regionHandle = m_regInfo.RegionHandle;
556 m_regionName = m_regInfo.RegionName; 556 m_regionName = m_regInfo.RegionName;
557
558 m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor;
559 557
560 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); 558 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
561 m_asyncSceneObjectDeleter.Enabled = true; 559 m_asyncSceneObjectDeleter.Enabled = true;
@@ -703,6 +701,7 @@ namespace OpenSim.Region.Framework.Scenes
703 m_clampPrimSize = true; 701 m_clampPrimSize = true;
704 } 702 }
705 703
704 m_seeIntoRegionFromNeighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
706 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); 705 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
707 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); 706 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);
708 m_dontPersistBefore = 707 m_dontPersistBefore =