diff options
author | Justin Clark-Casey (justincc) | 2011-10-15 03:03:05 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-15 03:03:05 +0100 |
commit | ddf54b5537f2701deeb615ef8e1eeef20b746ea1 (patch) | |
tree | 96b274be466fda1c0056add9a66d6ea3715fdcd2 /OpenSim/Region/Application | |
parent | fetch physical_prim switch from [Startup] config from inside scene, as is don... (diff) | |
download | opensim-SC-ddf54b5537f2701deeb615ef8e1eeef20b746ea1.zip opensim-SC-ddf54b5537f2701deeb615ef8e1eeef20b746ea1.tar.gz opensim-SC-ddf54b5537f2701deeb615ef8e1eeef20b746ea1.tar.bz2 opensim-SC-ddf54b5537f2701deeb615ef8e1eeef20b746ea1.tar.xz |
move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
2 files changed, 1 insertions, 4 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 19329dd..553786b 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -660,7 +660,7 @@ namespace OpenSim | |||
660 | return new Scene( | 660 | return new Scene( |
661 | regionInfo, circuitManager, sceneGridService, | 661 | regionInfo, circuitManager, sceneGridService, |
662 | simDataService, estateDataService, m_moduleLoader, false, | 662 | simDataService, estateDataService, m_moduleLoader, false, |
663 | m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); | 663 | m_config.Source, m_version); |
664 | } | 664 | } |
665 | 665 | ||
666 | protected void ShutdownClientServer(RegionInfo whichRegion) | 666 | protected void ShutdownClientServer(RegionInfo whichRegion) |