ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
This commit is contained in:
Melanie
2011-10-25 01:55:01 +01:00
parent 3cdea11e29 528cc8136e
commit f50538c81a
7 changed files with 29 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@@ -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);

2
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -742,7 +742,7 @@ namespace OpenSim
return new Scene(
regionInfo, circuitManager, sceneGridService,
simDataService, estateDataService, m_moduleLoader, false, m_configSettings.PhysicalPrim,
simDataService, estateDataService, m_moduleLoader, false,
m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
}