diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c76538f..4776654 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -557,7 +557,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
557 | SceneCommunicationService sceneGridService, | 557 | SceneCommunicationService sceneGridService, |
558 | ISimulationDataService simDataService, IEstateDataService estateDataService, | 558 | ISimulationDataService simDataService, IEstateDataService estateDataService, |
559 | ModuleLoader moduleLoader, bool dumpAssetsToFile, | 559 | ModuleLoader moduleLoader, bool dumpAssetsToFile, |
560 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 560 | IConfigSource config, string simulatorVersion) |
561 | : this(regInfo) | 561 | : this(regInfo) |
562 | { | 562 | { |
563 | m_config = config; | 563 | m_config = config; |
@@ -577,8 +577,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
577 | m_lastIncoming = 0; | 577 | m_lastIncoming = 0; |
578 | m_lastOutgoing = 0; | 578 | m_lastOutgoing = 0; |
579 | 579 | ||
580 | m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor; | ||
581 | |||
582 | m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); | 580 | m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); |
583 | m_asyncSceneObjectDeleter.Enabled = true; | 581 | m_asyncSceneObjectDeleter.Enabled = true; |
584 | 582 | ||
@@ -727,6 +725,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
727 | m_clampPrimSize = true; | 725 | m_clampPrimSize = true; |
728 | } | 726 | } |
729 | 727 | ||
728 | m_seeIntoRegionFromNeighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); | ||
730 | m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); | 729 | m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); |
731 | m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); | 730 | m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); |
732 | m_dontPersistBefore = | 731 | m_dontPersistBefore = |