diff options
| author | Melanie | 2011-10-25 02:14:39 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 02:14:39 +0100 |
| commit | 353f0c0e03499453dbeb2e39a85fcc99788fedf2 (patch) | |
| tree | 29fd038531f3b60b8d034edf8b4a2808f78cb70d /OpenSim/Region/Application/ConfigurationLoader.cs | |
| parent | Merge (diff) | |
| parent | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t... (diff) | |
| download | opensim-SC_OLD-353f0c0e03499453dbeb2e39a85fcc99788fedf2.zip opensim-SC_OLD-353f0c0e03499453dbeb2e39a85fcc99788fedf2.tar.gz opensim-SC_OLD-353f0c0e03499453dbeb2e39a85fcc99788fedf2.tar.bz2 opensim-SC_OLD-353f0c0e03499453dbeb2e39a85fcc99788fedf2.tar.xz | |
Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Application/ConfigurationLoader.cs')
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 3 |
1 files changed, 0 insertions, 3 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 |