diff options
author | Justin Clark-Casey (justincc) | 2014-07-29 01:21:15 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-07-29 01:21:15 +0100 |
commit | 3654ae8d8cea0bf0455974efe18ff99e484d2893 (patch) | |
tree | 4daebd94efd967de9d64f69ace7d057f514635e6 /OpenSim/Region/Application/OpenSimBase.cs | |
parent | minor: make "debug scene set" usage command accurate again from last commit f... (diff) | |
download | opensim-SC_OLD-3654ae8d8cea0bf0455974efe18ff99e484d2893.zip opensim-SC_OLD-3654ae8d8cea0bf0455974efe18ff99e484d2893.tar.gz opensim-SC_OLD-3654ae8d8cea0bf0455974efe18ff99e484d2893.tar.bz2 opensim-SC_OLD-3654ae8d8cea0bf0455974efe18ff99e484d2893.tar.xz |
Allow the "debug scene set physics false|true" command to work when bulletsim physics is running in a separate thread.
This will also allow the "disable physics" setting in the region debug viewer dialog to work in this circumstance.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 7 |
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 | } |