aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs3
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
3 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index b496108..d0f6ab7 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -362,9 +362,6 @@ namespace OpenSim
362 { 362 {
363 m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); 363 m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
364 m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); 364 m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
365
366 m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
367
368 m_configSettings.StorageDll = startupConfig.GetString("storage_plugin"); 365 m_configSettings.StorageDll = startupConfig.GetString("storage_plugin");
369 366
370 m_configSettings.ClientstackDll 367 m_configSettings.ClientstackDll
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 73b60dd..542211a 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -743,7 +743,7 @@ namespace OpenSim
743 return new Scene( 743 return new Scene(
744 regionInfo, circuitManager, sceneGridService, 744 regionInfo, circuitManager, sceneGridService,
745 simDataService, estateDataService, m_moduleLoader, false, 745 simDataService, estateDataService, m_moduleLoader, false,
746 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); 746 m_config.Source, m_version);
747 } 747 }
748 748
749 protected void ShutdownClientServer(RegionInfo whichRegion) 749 protected void ShutdownClientServer(RegionInfo whichRegion)
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 =