Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge

Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
author: Melanie 2011-10-25 01:55:01 +0100
committer: Melanie 2011-10-25 01:55:01 +0100
commit: f50538c81afe4c44e491c867cebb1674b682147b (patch)
tree: d2e7b8e9e4eb7cb41217265ad25da6153d477b79 /OpenSim/Region/Application/ConfigurationLoader.cs
parent: Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge (diff)
parent: fetch physical_prim switch from [Startup] config from inside scene, as is don... (diff)
download: opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.zip
opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.tar.gz
opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.tar.bz2
opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.tar.xz
1 files changed, 0 insertions, 1 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
            {
                m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
                m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
-                m_configSettings.PhysicalPrim = startupConfig.GetBoolean("physical_prim", true);
                m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
author	Melanie	2011-10-25 01:55:01 +0100
committer	Melanie	2011-10-25 01:55:01 +0100
commit	f50538c81afe4c44e491c867cebb1674b682147b (patch)
tree	d2e7b8e9e4eb7cb41217265ad25da6153d477b79 /OpenSim/Region/Application/ConfigurationLoader.cs
parent	Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge (diff)
parent	fetch physical_prim switch from [Startup] config from inside scene, as is don... (diff)
download	opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.zip opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.tar.gz opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.tar.bz2 opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.tar.xz

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