diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 4 | ||||
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 3be411a..62a52d6 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -752,10 +752,8 @@ namespace OpenSim | |||
752 | Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ); | 752 | Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ); |
753 | PhysicsScene physicsScene = GetPhysicsScene(regionInfo.RegionName, regionExtent); | 753 | PhysicsScene physicsScene = GetPhysicsScene(regionInfo.RegionName, regionExtent); |
754 | 754 | ||
755 | SceneCommunicationService sceneGridService = new SceneCommunicationService(); | ||
756 | |||
757 | return new Scene( | 755 | return new Scene( |
758 | regionInfo, circuitManager, physicsScene, sceneGridService, | 756 | regionInfo, circuitManager, physicsScene, |
759 | simDataService, estateDataService, | 757 | simDataService, estateDataService, |
760 | Config, m_version); | 758 | Config, m_version); |
761 | } | 759 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index fe99ae5..04e2664 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -851,7 +851,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
851 | #region Constructors | 851 | #region Constructors |
852 | 852 | ||
853 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene, | 853 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene, |
854 | SceneCommunicationService sceneGridService, | ||
855 | ISimulationDataService simDataService, IEstateDataService estateDataService, | 854 | ISimulationDataService simDataService, IEstateDataService estateDataService, |
856 | IConfigSource config, string simulatorVersion) | 855 | IConfigSource config, string simulatorVersion) |
857 | : this(regInfo, physicsScene) | 856 | : this(regInfo, physicsScene) |
@@ -865,7 +864,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
865 | 864 | ||
866 | m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue / 2)) + (uint)(uint.MaxValue / 4); | 865 | m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue / 2)) + (uint)(uint.MaxValue / 4); |
867 | m_authenticateHandler = authen; | 866 | m_authenticateHandler = authen; |
868 | m_sceneGridService = sceneGridService; | 867 | m_sceneGridService = new SceneCommunicationService(); |
869 | m_SimulationDataService = simDataService; | 868 | m_SimulationDataService = simDataService; |
870 | m_EstateDataService = estateDataService; | 869 | m_EstateDataService = estateDataService; |
871 | 870 | ||