diff options
author | Justin Clark-Casey (justincc) | 2011-10-15 02:54:43 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-15 02:54:43 +0100 |
commit | 528cc8136e567b5bac583728fbb0235baaba2f02 (patch) | |
tree | f550fb1ff8b6a7845026e1cf6e650a6ff505e54e /OpenSim/Region/Application | |
parent | remove now redundant m_physical_prim flag from SOP.ApplyPhysics() (diff) | |
download | opensim-SC_OLD-528cc8136e567b5bac583728fbb0235baaba2f02.zip opensim-SC_OLD-528cc8136e567b5bac583728fbb0235baaba2f02.tar.gz opensim-SC_OLD-528cc8136e567b5bac583728fbb0235baaba2f02.tar.bz2 opensim-SC_OLD-528cc8136e567b5bac583728fbb0235baaba2f02.tar.xz |
fetch physical_prim switch from [Startup] config from inside scene, as is done for most other scene config params
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index d19852b..b496108 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
@@ -362,7 +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 | m_configSettings.PhysicalPrim = startupConfig.GetBoolean("physical_prim", true); | ||
366 | 365 | ||
367 | m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); | 366 | m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); |
368 | 367 | ||
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index e867bc2..19329dd 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -659,7 +659,7 @@ namespace OpenSim | |||
659 | 659 | ||
660 | return new Scene( | 660 | return new Scene( |
661 | regionInfo, circuitManager, sceneGridService, | 661 | regionInfo, circuitManager, sceneGridService, |
662 | simDataService, estateDataService, m_moduleLoader, false, m_configSettings.PhysicalPrim, | 662 | simDataService, estateDataService, m_moduleLoader, false, |
663 | m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); | 663 | m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); |
664 | } | 664 | } |
665 | 665 | ||