diff options
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index c2d9942..1d93e9b 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -825,8 +825,8 @@ namespace OpenSim | |||
825 | MainConsole.Instance.Output(String.Format( | 825 | MainConsole.Instance.Output(String.Format( |
826 | "Region Name: {0}, Region XLoc: {1}, Region YLoc: {2}, Region Port: {3}, Estate Name: {4}", | 826 | "Region Name: {0}, Region XLoc: {1}, Region YLoc: {2}, Region Port: {3}, Estate Name: {4}", |
827 | scene.RegionInfo.RegionName, | 827 | scene.RegionInfo.RegionName, |
828 | scene.RegionInfo.RegionLocX, | 828 | scene.RegionInfo.LegacyRegionLocX, |
829 | scene.RegionInfo.RegionLocY, | 829 | scene.RegionInfo.LegacyRegionLocY, |
830 | scene.RegionInfo.InternalEndPoint.Port, | 830 | scene.RegionInfo.InternalEndPoint.Port, |
831 | scene.RegionInfo.EstateSettings.EstateName)); | 831 | scene.RegionInfo.EstateSettings.EstateName)); |
832 | }); | 832 | }); |
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 308638c..7e7f42e 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -690,7 +690,8 @@ namespace OpenSim | |||
690 | clientServer = clientNetworkServers; | 690 | clientServer = clientNetworkServers; |
691 | scene.LoadWorldMap(); | 691 | scene.LoadWorldMap(); |
692 | 692 | ||
693 | scene.PhysicsScene = GetPhysicsScene(scene.RegionInfo.RegionName); | 693 | Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ); |
694 | scene.PhysicsScene = GetPhysicsScene(scene.RegionInfo.RegionName, regionExtent); | ||
694 | scene.PhysicsScene.RequestAssetMethod = scene.PhysicsRequestAsset; | 695 | scene.PhysicsScene.RequestAssetMethod = scene.PhysicsRequestAsset; |
695 | scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); | 696 | scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); |
696 | scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); | 697 | scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); |
@@ -742,7 +743,7 @@ namespace OpenSim | |||
742 | { | 743 | { |
743 | m_log.InfoFormat( | 744 | m_log.InfoFormat( |
744 | "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})", | 745 | "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})", |
745 | whichRegion.RegionName, whichRegion.RegionLocX, whichRegion.RegionLocY); | 746 | whichRegion.RegionName, whichRegion.LegacyRegionLocX, whichRegion.LegacyRegionLocY); |
746 | 747 | ||
747 | ShutdownClientServer(whichRegion); | 748 | ShutdownClientServer(whichRegion); |
748 | IScene scene; | 749 | IScene scene; |
@@ -752,10 +753,10 @@ namespace OpenSim | |||
752 | 753 | ||
753 | # region Setup methods | 754 | # region Setup methods |
754 | 755 | ||
755 | protected override PhysicsScene GetPhysicsScene(string osSceneIdentifier) | 756 | protected override PhysicsScene GetPhysicsScene(string osSceneIdentifier, Vector3 regionExtent) |
756 | { | 757 | { |
757 | return GetPhysicsScene( | 758 | return GetPhysicsScene( |
758 | m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, Config, osSceneIdentifier); | 759 | m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, Config, osSceneIdentifier, regionExtent); |
759 | } | 760 | } |
760 | 761 | ||
761 | /// <summary> | 762 | /// <summary> |