aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs15
1 files changed, 1 insertions, 14 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 68fba97..980fa85 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -734,10 +734,6 @@ namespace OpenSim
734 clientServer = clientNetworkServers; 734 clientServer = clientNetworkServers;
735 scene.LoadWorldMap(); 735 scene.LoadWorldMap();
736 736
737 scene.PhysicsScene.RequestAssetMethod = scene.PhysicsRequestAsset;
738 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised());
739 scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight);
740
741 return scene; 737 return scene;
742 } 738 }
743 739
@@ -749,11 +745,8 @@ namespace OpenSim
749 protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, 745 protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService,
750 IEstateDataService estateDataService, AgentCircuitManager circuitManager) 746 IEstateDataService estateDataService, AgentCircuitManager circuitManager)
751 { 747 {
752 Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ);
753 PhysicsScene physicsScene = GetPhysicsScene(regionInfo.RegionName, regionExtent);
754
755 return new Scene( 748 return new Scene(
756 regionInfo, circuitManager, physicsScene, 749 regionInfo, circuitManager,
757 simDataService, estateDataService, 750 simDataService, estateDataService,
758 Config, m_version); 751 Config, m_version);
759 } 752 }
@@ -796,12 +789,6 @@ namespace OpenSim
796 789
797 # region Setup methods 790 # region Setup methods
798 791
799 protected override PhysicsScene GetPhysicsScene(string osSceneIdentifier, Vector3 regionExtent)
800 {
801 return GetPhysicsScene(
802 m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, Config, osSceneIdentifier, regionExtent);
803 }
804
805 /// <summary> 792 /// <summary>
806 /// Handler to supply the current status of this sim 793 /// Handler to supply the current status of this sim
807 /// </summary> 794 /// </summary>