aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index d2dce24..ab606a3 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -730,8 +730,6 @@ namespace OpenSim
730 clientServer = clientNetworkServers; 730 clientServer = clientNetworkServers;
731 scene.LoadWorldMap(); 731 scene.LoadWorldMap();
732 732
733 Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ);
734 scene.PhysicsScene = GetPhysicsScene(scene.RegionInfo.RegionName, regionExtent);
735 scene.PhysicsScene.RequestAssetMethod = scene.PhysicsRequestAsset; 733 scene.PhysicsScene.RequestAssetMethod = scene.PhysicsRequestAsset;
736 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); 734 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised());
737 scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); 735 scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight);
@@ -747,10 +745,13 @@ namespace OpenSim
747 protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, 745 protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService,
748 IEstateDataService estateDataService, AgentCircuitManager circuitManager) 746 IEstateDataService estateDataService, AgentCircuitManager circuitManager)
749 { 747 {
748 Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ);
749 PhysicsScene physicsScene = GetPhysicsScene(regionInfo.RegionName, regionExtent);
750
750 SceneCommunicationService sceneGridService = new SceneCommunicationService(); 751 SceneCommunicationService sceneGridService = new SceneCommunicationService();
751 752
752 return new Scene( 753 return new Scene(
753 regionInfo, circuitManager, sceneGridService, 754 regionInfo, circuitManager, physicsScene, sceneGridService,
754 simDataService, estateDataService, 755 simDataService, estateDataService,
755 Config, m_version); 756 Config, m_version);
756 } 757 }