aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorUbitUmarov2015-08-19 11:04:28 +0100
committerUbitUmarov2015-08-19 11:04:28 +0100
commit0af2fafddf36009ffe470da106dc6d0ceb3ced10 (patch)
treec5d2a58398fcc4bd1b4722a8379ce9bb643fe8e5 /OpenSim/Region/Application
parentMerge branch 'mbworkvar2' into ubitvar (diff)
downloadopensim-SC_OLD-0af2fafddf36009ffe470da106dc6d0ceb3ced10.zip
opensim-SC_OLD-0af2fafddf36009ffe470da106dc6d0ceb3ced10.tar.gz
opensim-SC_OLD-0af2fafddf36009ffe470da106dc6d0ceb3ced10.tar.bz2
opensim-SC_OLD-0af2fafddf36009ffe470da106dc6d0ceb3ced10.tar.xz
add missing regionExtent setup and Scene physicsscene configuration ( not
exactly as core)
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f663c77..e8cf7cc 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -767,7 +767,6 @@ namespace OpenSim
767 clientServer = clientNetworkServers; 767 clientServer = clientNetworkServers;
768 scene.LoadWorldMap(); 768 scene.LoadWorldMap();
769 769
770 scene.PhysicsScene = GetPhysicsScene(scene.RegionInfo.RegionName);
771 scene.PhysicsScene.RequestAssetMethod = scene.PhysicsRequestAsset; 770 scene.PhysicsScene.RequestAssetMethod = scene.PhysicsRequestAsset;
772 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); 771 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised());
773 scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); 772 scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight);
@@ -783,10 +782,12 @@ namespace OpenSim
783 protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, 782 protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService,
784 IEstateDataService estateDataService, AgentCircuitManager circuitManager) 783 IEstateDataService estateDataService, AgentCircuitManager circuitManager)
785 { 784 {
785 Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ);
786 PhysicsScene physicsScene = GetPhysicsScene(regionInfo.RegionName, regionExtent);
786 SceneCommunicationService sceneGridService = new SceneCommunicationService(); 787 SceneCommunicationService sceneGridService = new SceneCommunicationService();
787 788
788 return new Scene( 789 return new Scene(
789 regionInfo, circuitManager, sceneGridService, 790 regionInfo, circuitManager, physicsScene, sceneGridService,
790 simDataService, estateDataService, 791 simDataService, estateDataService,
791 Config, m_version); 792 Config, m_version);
792 } 793 }
@@ -829,10 +830,10 @@ namespace OpenSim
829 830
830 # region Setup methods 831 # region Setup methods
831 832
832 protected override PhysicsScene GetPhysicsScene(string osSceneIdentifier) 833 protected override PhysicsScene GetPhysicsScene(string osSceneIdentifier, Vector3 regionExtent)
833 { 834 {
834 return GetPhysicsScene( 835 return GetPhysicsScene(
835 m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, Config, osSceneIdentifier); 836 m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, Config, osSceneIdentifier, regionExtent);
836 } 837 }
837 838
838 /// <summary> 839 /// <summary>